brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure G_PARAM_STATIC_STRINGS for all properties

Browse Source 
In `st`, we can do this by using `ST_PARAM_*`. In the other code files,
just use `G_PARAM_STATIC_STRINGS` directly.

This is just a minor convenience to prevent a few unnecessary string
copies.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/646
This commit is contained in:
Niels De Graef 2019-07-25 19:34:19 +02:00 committed by Florian Müllner
parent d360114226
commit 28ab1f4af4
20 changed files with 94 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotplug-sniffer/shell-mime-sniffer.c
View File

@ -543,7 +543,7 @@ shell_mime_sniffer_class_init (ShellMimeSnifferClass *klass)
"File", "File",
"The loaded file", "The loaded file",
G_TYPE_FILE, G_TYPE_FILE,
G_PARAM_READWRITE); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_properties (oclass, NUM_PROPERTIES, properties); g_object_class_install_properties (oclass, NUM_PROPERTIES, properties);
} }

4
src/shell-app.c
View File

@ -1533,7 +1533,7 @@ shell_app_class_init(ShellAppClass *klass)
"Application state", "Application state",
SHELL_TYPE_APP_STATE, SHELL_TYPE_APP_STATE,
SHELL_APP_STATE_STOPPED, SHELL_APP_STATE_STOPPED,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/** /**
* ShellApp:busy: * ShellApp:busy:
@ -1546,7 +1546,7 @@ shell_app_class_init(ShellAppClass *klass)
"Busy", "Busy",
"Busy state", "Busy state",
FALSE, FALSE,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/** /**
* ShellApp:id: * ShellApp:id:

32
src/shell-global.c
View File

@ -365,7 +365,7 @@ shell_global_class_init (ShellGlobalClass *klass)
"Session Mode", "Session Mode",
"The session mode to use", "The session mode to use",
"user", "user",
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_SCREEN_WIDTH, PROP_SCREEN_WIDTH,
@ -373,7 +373,7 @@ shell_global_class_init (ShellGlobalClass *klass)
"Screen Width", "Screen Width",
"Screen width, in pixels", "Screen width, in pixels",
0, G_MAXINT, 1, 0, G_MAXINT, 1,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_SCREEN_HEIGHT, PROP_SCREEN_HEIGHT,
@ -381,14 +381,14 @@ shell_global_class_init (ShellGlobalClass *klass)
"Screen Height", "Screen Height",
"Screen height, in pixels", "Screen height, in pixels",
0, G_MAXINT, 1, 0, G_MAXINT, 1,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_DISPLAY, PROP_DISPLAY,
g_param_spec_object ("display", g_param_spec_object ("display",
"Display", "Display",
"Metacity display object for the shell", "Metacity display object for the shell",
META_TYPE_DISPLAY, META_TYPE_DISPLAY,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_WORKSPACE_MANAGER, PROP_WORKSPACE_MANAGER,
@ -396,7 +396,7 @@ shell_global_class_init (ShellGlobalClass *klass)
"Workspace manager", "Workspace manager",
"Workspace manager", "Workspace manager",
META_TYPE_WORKSPACE_MANAGER, META_TYPE_WORKSPACE_MANAGER,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_STAGE, PROP_STAGE,
@ -404,14 +404,14 @@ shell_global_class_init (ShellGlobalClass *klass)
"Stage", "Stage",
"Stage holding the desktop scene graph", "Stage holding the desktop scene graph",
CLUTTER_TYPE_ACTOR, CLUTTER_TYPE_ACTOR,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_WINDOW_GROUP, PROP_WINDOW_GROUP,
g_param_spec_object ("window-group", g_param_spec_object ("window-group",
"Window Group", "Window Group",
"Actor holding window actors", "Actor holding window actors",
CLUTTER_TYPE_ACTOR, CLUTTER_TYPE_ACTOR,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_TOP_WINDOW_GROUP, PROP_TOP_WINDOW_GROUP,
@ -419,7 +419,7 @@ shell_global_class_init (ShellGlobalClass *klass)
"Top Window Group", "Top Window Group",
"Actor holding override-redirect windows", "Actor holding override-redirect windows",
CLUTTER_TYPE_ACTOR, CLUTTER_TYPE_ACTOR,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_WINDOW_MANAGER, PROP_WINDOW_MANAGER,
@ -427,56 +427,56 @@ shell_global_class_init (ShellGlobalClass *klass)
"Window Manager", "Window Manager",
"Window management interface", "Window management interface",
SHELL_TYPE_WM, SHELL_TYPE_WM,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_SETTINGS, PROP_SETTINGS,
g_param_spec_object ("settings", g_param_spec_object ("settings",
"Settings", "Settings",
"GSettings instance for gnome-shell configuration", "GSettings instance for gnome-shell configuration",
G_TYPE_SETTINGS, G_TYPE_SETTINGS,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_DATADIR, PROP_DATADIR,
g_param_spec_string ("datadir", g_param_spec_string ("datadir",
"Data directory", "Data directory",
"Directory containing gnome-shell data files", "Directory containing gnome-shell data files",
NULL, NULL,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_IMAGEDIR, PROP_IMAGEDIR,
g_param_spec_string ("imagedir", g_param_spec_string ("imagedir",
"Image directory", "Image directory",
"Directory containing gnome-shell image files", "Directory containing gnome-shell image files",
NULL, NULL,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_USERDATADIR, PROP_USERDATADIR,
g_param_spec_string ("userdatadir", g_param_spec_string ("userdatadir",
"User data directory", "User data directory",
"Directory containing gnome-shell user data", "Directory containing gnome-shell user data",
NULL, NULL,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_FOCUS_MANAGER, PROP_FOCUS_MANAGER,
g_param_spec_object ("focus-manager", g_param_spec_object ("focus-manager",
"Focus manager", "Focus manager",
"The shell's StFocusManager", "The shell's StFocusManager",
ST_TYPE_FOCUS_MANAGER, ST_TYPE_FOCUS_MANAGER,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_FRAME_TIMESTAMPS, PROP_FRAME_TIMESTAMPS,
g_param_spec_boolean ("frame-timestamps", g_param_spec_boolean ("frame-timestamps",
"Frame Timestamps", "Frame Timestamps",
"Whether to log frame timestamps in the performance log", "Whether to log frame timestamps in the performance log",
FALSE, FALSE,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_FRAME_FINISH_TIMESTAMP, PROP_FRAME_FINISH_TIMESTAMP,
g_param_spec_boolean ("frame-finish-timestamp", g_param_spec_boolean ("frame-finish-timestamp",
"Frame Finish Timestamps", "Frame Finish Timestamps",
"Whether at the end of a frame to call glFinish and log paintCompletedTimestamp", "Whether at the end of a frame to call glFinish and log paintCompletedTimestamp",
FALSE, FALSE,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
} }
/* /*

12
src/shell-keyring-prompt.c
View File

@ -347,7 +347,7 @@ shell_keyring_prompt_class_init (ShellKeyringPromptClass *klass)
*/ */
g_object_class_install_property (gobject_class, PROP_PASSWORD_VISIBLE, g_object_class_install_property (gobject_class, PROP_PASSWORD_VISIBLE,
g_param_spec_boolean ("password-visible", "Password visible", "Password field is visible", g_param_spec_boolean ("password-visible", "Password visible", "Password field is visible",
FALSE, G_PARAM_READABLE)); FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/** /**
* ShellKeyringPrompt:confirm-visible: * ShellKeyringPrompt:confirm-visible:
@ -356,7 +356,7 @@ shell_keyring_prompt_class_init (ShellKeyringPromptClass *klass)
*/ */
g_object_class_install_property (gobject_class, PROP_CONFIRM_VISIBLE, g_object_class_install_property (gobject_class, PROP_CONFIRM_VISIBLE,
g_param_spec_boolean ("confirm-visible", "Confirm visible", "Confirm field is visible", g_param_spec_boolean ("confirm-visible", "Confirm visible", "Confirm field is visible",
FALSE, G_PARAM_READABLE)); FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/** /**
* ShellKeyringPrompt:warning-visible: * ShellKeyringPrompt:warning-visible:
@ -365,7 +365,7 @@ shell_keyring_prompt_class_init (ShellKeyringPromptClass *klass)
*/ */
g_object_class_install_property (gobject_class, PROP_WARNING_VISIBLE, g_object_class_install_property (gobject_class, PROP_WARNING_VISIBLE,
g_param_spec_boolean ("warning-visible", "Warning visible", "Warning is visible", g_param_spec_boolean ("warning-visible", "Warning visible", "Warning is visible",
FALSE, G_PARAM_READABLE)); FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/** /**
* ShellKeyringPrompt:choice-visible: * ShellKeyringPrompt:choice-visible:
@ -374,7 +374,7 @@ shell_keyring_prompt_class_init (ShellKeyringPromptClass *klass)
*/ */
g_object_class_install_property (gobject_class, PROP_CHOICE_VISIBLE, g_object_class_install_property (gobject_class, PROP_CHOICE_VISIBLE,
g_param_spec_boolean ("choice-visible", "Choice visible", "Choice is visible", g_param_spec_boolean ("choice-visible", "Choice visible", "Choice is visible",
FALSE, G_PARAM_READABLE)); FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/** /**
* ShellKeyringPrompt:password-actor: * ShellKeyringPrompt:password-actor:
@ -383,7 +383,7 @@ shell_keyring_prompt_class_init (ShellKeyringPromptClass *klass)
*/ */
g_object_class_install_property (gobject_class, PROP_PASSWORD_ACTOR, g_object_class_install_property (gobject_class, PROP_PASSWORD_ACTOR,
g_param_spec_object ("password-actor", "Password actor", "Text field for password", g_param_spec_object ("password-actor", "Password actor", "Text field for password",
CLUTTER_TYPE_TEXT, G_PARAM_READWRITE)); CLUTTER_TYPE_TEXT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/** /**
* ShellKeyringPrompt:confirm-actor: * ShellKeyringPrompt:confirm-actor:
@ -392,7 +392,7 @@ shell_keyring_prompt_class_init (ShellKeyringPromptClass *klass)
*/ */
g_object_class_install_property (gobject_class, PROP_CONFIRM_ACTOR, g_object_class_install_property (gobject_class, PROP_CONFIRM_ACTOR,
g_param_spec_object ("confirm-actor", "Confirm actor", "Text field for confirming password", g_param_spec_object ("confirm-actor", "Confirm actor", "Text field for confirming password",
CLUTTER_TYPE_TEXT, G_PARAM_READWRITE)); CLUTTER_TYPE_TEXT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
signals[SIGNAL_SHOW_PASSWORD] = g_signal_new ("show-password", G_TYPE_FROM_CLASS (klass), signals[SIGNAL_SHOW_PASSWORD] = g_signal_new ("show-password", G_TYPE_FROM_CLASS (klass),
0, 0, NULL, NULL, 0, 0, NULL, NULL,

4
src/shell-recorder-src.c
View File

@ -321,14 +321,14 @@ shell_recorder_src_class_init (ShellRecorderSrcClass *klass)
"Caps", "Caps",
"Fixed GstCaps for the source", "Fixed GstCaps for the source",
GST_TYPE_CAPS, GST_TYPE_CAPS,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_MEMORY_USED, PROP_MEMORY_USED,
g_param_spec_uint ("memory-used", g_param_spec_uint ("memory-used",
"Memory Used", "Memory Used",
"Memory currently used by the queue (in kB)", "Memory currently used by the queue (in kB)",
0, G_MAXUINT, 0, 0, G_MAXUINT, 0,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
gst_element_class_add_pad_template (element_class, gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&src_template)); gst_static_pad_template_get (&src_template));

12
src/shell-recorder.c
View File

@ -835,7 +835,7 @@ shell_recorder_class_init (ShellRecorderClass *klass)
"Display", "Display",
"Display to record", "Display to record",
META_TYPE_DISPLAY, META_TYPE_DISPLAY,
G_PARAM_WRITABLE)); G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_STAGE, PROP_STAGE,
@ -843,7 +843,7 @@ shell_recorder_class_init (ShellRecorderClass *klass)
"Stage", "Stage",
"Stage to record", "Stage to record",
CLUTTER_TYPE_STAGE, CLUTTER_TYPE_STAGE,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_FRAMERATE, PROP_FRAMERATE,
@ -853,7 +853,7 @@ shell_recorder_class_init (ShellRecorderClass *klass)
0, 0,
G_MAXINT, G_MAXINT,
DEFAULT_FRAMES_PER_SECOND, DEFAULT_FRAMES_PER_SECOND,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_PIPELINE, PROP_PIPELINE,
@ -861,7 +861,7 @@ shell_recorder_class_init (ShellRecorderClass *klass)
"Pipeline", "Pipeline",
"GStreamer pipeline description to encode recordings", "GStreamer pipeline description to encode recordings",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_FILE_TEMPLATE, PROP_FILE_TEMPLATE,
@ -869,7 +869,7 @@ shell_recorder_class_init (ShellRecorderClass *klass)
"File Template", "File Template",
"The filename template to use for output files", "The filename template to use for output files",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_DRAW_CURSOR, PROP_DRAW_CURSOR,
@ -877,7 +877,7 @@ shell_recorder_class_init (ShellRecorderClass *klass)
"Draw Cursor", "Draw Cursor",
"Whether to record the cursor", "Whether to record the cursor",
TRUE, TRUE,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
} }
/* Sets the GstCaps (video format, in this case) on the stream /* Sets the GstCaps (video format, in this case) on the stream

6
src/shell-tray-icon.c
View File

@ -136,21 +136,21 @@ shell_tray_icon_class_init (ShellTrayIconClass *klass)
"PID", "PID",
"The PID of the icon's application", "The PID of the icon's application",
0, G_MAXUINT, 0, 0, G_MAXUINT, 0,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_TITLE, PROP_TITLE,
g_param_spec_string ("title", g_param_spec_string ("title",
"Title", "Title",
"The icon's window title", "The icon's window title",
NULL, NULL,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_WM_CLASS, PROP_WM_CLASS,
g_param_spec_string ("wm-class", g_param_spec_string ("wm-class",
"WM Class", "WM Class",
"The icon's window WM_CLASS", "The icon's window WM_CLASS",
NULL, NULL,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
} }
static void static void

2
src/shell-window-tracker.c
View File

@ -103,7 +103,7 @@ shell_window_tracker_class_init (ShellWindowTrackerClass *klass)
"Focus App", "Focus App",
"Focused application", "Focused application",
SHELL_TYPE_APP, SHELL_TYPE_APP,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
signals[STARTUP_SEQUENCE_CHANGED] = g_signal_new ("startup-sequence-changed", signals[STARTUP_SEQUENCE_CHANGED] = g_signal_new ("startup-sequence-changed",
SHELL_TYPE_WINDOW_TRACKER, SHELL_TYPE_WINDOW_TRACKER,

14
src/st/st-button.c
View File

@ -479,33 +479,37 @@ st_button_class_init (StButtonClass *klass)
pspec = g_param_spec_string ("label", pspec = g_param_spec_string ("label",
"Label", "Label",
"Label of the button", "Label of the button",
NULL, G_PARAM_READWRITE); NULL,
ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_LABEL, pspec); g_object_class_install_property (gobject_class, PROP_LABEL, pspec);
pspec = g_param_spec_flags ("button-mask", pspec = g_param_spec_flags ("button-mask",
"Button mask", "Button mask",
"Which buttons trigger the 'clicked' signal", "Which buttons trigger the 'clicked' signal",
ST_TYPE_BUTTON_MASK, ST_BUTTON_ONE, ST_TYPE_BUTTON_MASK, ST_BUTTON_ONE,
G_PARAM_READWRITE); ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_BUTTON_MASK, pspec); g_object_class_install_property (gobject_class, PROP_BUTTON_MASK, pspec);
pspec = g_param_spec_boolean ("toggle-mode", pspec = g_param_spec_boolean ("toggle-mode",
"Toggle Mode", "Toggle Mode",
"Enable or disable toggling", "Enable or disable toggling",
FALSE, G_PARAM_READWRITE); FALSE,
ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_TOGGLE_MODE, pspec); g_object_class_install_property (gobject_class, PROP_TOGGLE_MODE, pspec);
pspec = g_param_spec_boolean ("checked", pspec = g_param_spec_boolean ("checked",
"Checked", "Checked",
"Indicates if a toggle button is \"on\"" "Indicates if a toggle button is \"on\""
" or \"off\"", " or \"off\"",
FALSE, G_PARAM_READWRITE); FALSE,
ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_CHECKED, pspec); g_object_class_install_property (gobject_class, PROP_CHECKED, pspec);
pspec = g_param_spec_boolean ("pressed", pspec = g_param_spec_boolean ("pressed",
"Pressed", "Pressed",
"Indicates if the button is pressed in", "Indicates if the button is pressed in",
FALSE, G_PARAM_READABLE); FALSE,
ST_PARAM_READABLE);
g_object_class_install_property (gobject_class, PROP_PRESSED, pspec); g_object_class_install_property (gobject_class, PROP_PRESSED, pspec);

18
src/st/st-entry.c
View File

@ -937,28 +937,29 @@ st_entry_class_init (StEntryClass *klass)
"Clutter Text", "Clutter Text",
"Internal ClutterText actor", "Internal ClutterText actor",
CLUTTER_TYPE_TEXT, CLUTTER_TYPE_TEXT,
G_PARAM_READABLE); ST_PARAM_READABLE);
g_object_class_install_property (gobject_class, PROP_CLUTTER_TEXT, pspec); g_object_class_install_property (gobject_class, PROP_CLUTTER_TEXT, pspec);
pspec = g_param_spec_object ("primary-icon", pspec = g_param_spec_object ("primary-icon",
"Primary Icon", "Primary Icon",
"Primary Icon actor", "Primary Icon actor",
CLUTTER_TYPE_ACTOR, CLUTTER_TYPE_ACTOR,
G_PARAM_READWRITE); ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_PRIMARY_ICON, pspec); g_object_class_install_property (gobject_class, PROP_PRIMARY_ICON, pspec);
pspec = g_param_spec_object ("secondary-icon", pspec = g_param_spec_object ("secondary-icon",
"Secondary Icon", "Secondary Icon",
"Secondary Icon actor", "Secondary Icon actor",
CLUTTER_TYPE_ACTOR, CLUTTER_TYPE_ACTOR,
G_PARAM_READWRITE); ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_SECONDARY_ICON, pspec); g_object_class_install_property (gobject_class, PROP_SECONDARY_ICON, pspec);
pspec = g_param_spec_string ("hint-text", pspec = g_param_spec_string ("hint-text",
"Hint Text", "Hint Text",
"Text to display when the entry is not focused " "Text to display when the entry is not focused "
"and the text property is empty", "and the text property is empty",
NULL, G_PARAM_READWRITE); NULL,
ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_HINT_TEXT, pspec); g_object_class_install_property (gobject_class, PROP_HINT_TEXT, pspec);
pspec = g_param_spec_object ("hint-actor", pspec = g_param_spec_object ("hint-actor",
@ -966,13 +967,14 @@ st_entry_class_init (StEntryClass *klass)
"An actor to display when the entry is not focused " "An actor to display when the entry is not focused "
"and the text property is empty", "and the text property is empty",
CLUTTER_TYPE_ACTOR, CLUTTER_TYPE_ACTOR,
G_PARAM_READWRITE); ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_HINT_ACTOR, pspec); g_object_class_install_property (gobject_class, PROP_HINT_ACTOR, pspec);
pspec = g_param_spec_string ("text", pspec = g_param_spec_string ("text",
"Text", "Text",
"Text of the entry", "Text of the entry",
NULL, G_PARAM_READWRITE); NULL,
ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_TEXT, pspec); g_object_class_install_property (gobject_class, PROP_TEXT, pspec);
pspec = g_param_spec_enum ("input-purpose", pspec = g_param_spec_enum ("input-purpose",
@ -980,7 +982,7 @@ st_entry_class_init (StEntryClass *klass)
"Purpose of the text field", "Purpose of the text field",
CLUTTER_TYPE_INPUT_CONTENT_PURPOSE, CLUTTER_TYPE_INPUT_CONTENT_PURPOSE,
CLUTTER_INPUT_CONTENT_PURPOSE_NORMAL, CLUTTER_INPUT_CONTENT_PURPOSE_NORMAL,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_INPUT_PURPOSE, PROP_INPUT_PURPOSE,
pspec); pspec);
@ -989,7 +991,7 @@ st_entry_class_init (StEntryClass *klass)
"hints", "hints",
"Hints for the text field behaviour", "Hints for the text field behaviour",
CLUTTER_TYPE_INPUT_CONTENT_HINT_FLAGS, CLUTTER_TYPE_INPUT_CONTENT_HINT_FLAGS,
0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); 0, ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_INPUT_HINTS, PROP_INPUT_HINTS,
pspec); pspec);

5
src/st/st-image-content.c
View File

@ -19,6 +19,7 @@
*/ */
#include "st-image-content.h" #include "st-image-content.h"
#include "st-private.h"
struct _StImageContent struct _StImageContent
{ {
@ -127,14 +128,14 @@ st_image_content_class_init (StImageContentClass *klass)
"Preferred Width", "Preferred Width",
"Preferred Width of the Content when painted", "Preferred Width of the Content when painted",
-1, G_MAXINT, -1, -1, G_MAXINT, -1,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE); G_PARAM_CONSTRUCT_ONLY | ST_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_PREFERRED_WIDTH, pspec); g_object_class_install_property (object_class, PROP_PREFERRED_WIDTH, pspec);
pspec = g_param_spec_int ("preferred-height", pspec = g_param_spec_int ("preferred-height",
"Preferred Height", "Preferred Height",
"Preferred Height of the Content when painted", "Preferred Height of the Content when painted",
-1, G_MAXINT, -1, -1, G_MAXINT, -1,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE); G_PARAM_CONSTRUCT_ONLY | ST_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_PREFERRED_HEIGHT, pspec); g_object_class_install_property (object_class, PROP_PREFERRED_HEIGHT, pspec);
} }

5
src/st/st-label.c
View File

@ -268,13 +268,14 @@ st_label_class_init (StLabelClass *klass)
"Clutter Text", "Clutter Text",
"Internal ClutterText actor", "Internal ClutterText actor",
CLUTTER_TYPE_TEXT, CLUTTER_TYPE_TEXT,
G_PARAM_READABLE); ST_PARAM_READABLE);
g_object_class_install_property (gobject_class, PROP_CLUTTER_TEXT, pspec); g_object_class_install_property (gobject_class, PROP_CLUTTER_TEXT, pspec);
pspec = g_param_spec_string ("text", pspec = g_param_spec_string ("text",
"Text", "Text",
"Text of the label", "Text of the label",
NULL, G_PARAM_READWRITE); NULL,
ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_TEXT, pspec); g_object_class_install_property (gobject_class, PROP_TEXT, pspec);
} }

7
src/st/st-scroll-view-fade.c
View File

@ -19,6 +19,7 @@
*/ */
#include "st-private.h"
#include "st-scroll-view-fade.h" #include "st-scroll-view-fade.h"
#include "st-scroll-view.h" #include "st-scroll-view.h"
#include "st-widget.h" #include "st-widget.h"
@ -389,21 +390,21 @@ st_scroll_view_fade_class_init (StScrollViewFadeClass *klass)
"Vertical Fade Offset", "Vertical Fade Offset",
"The height of the area which is faded at the edge", "The height of the area which is faded at the edge",
0.f, G_MAXFLOAT, DEFAULT_FADE_OFFSET, 0.f, G_MAXFLOAT, DEFAULT_FADE_OFFSET,
G_PARAM_READWRITE)); ST_PARAM_READWRITE));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_HFADE_OFFSET, PROP_HFADE_OFFSET,
g_param_spec_float ("hfade-offset", g_param_spec_float ("hfade-offset",
"Horizontal Fade Offset", "Horizontal Fade Offset",
"The width of the area which is faded at the edge", "The width of the area which is faded at the edge",
0.f, G_MAXFLOAT, DEFAULT_FADE_OFFSET, 0.f, G_MAXFLOAT, DEFAULT_FADE_OFFSET,
G_PARAM_READWRITE)); ST_PARAM_READWRITE));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_FADE_EDGES, PROP_FADE_EDGES,
g_param_spec_boolean ("fade-edges", g_param_spec_boolean ("fade-edges",
"Fade Edges", "Fade Edges",
"Whether the faded area should extend to the edges", "Whether the faded area should extend to the edges",
FALSE, FALSE,
G_PARAM_READWRITE)); ST_PARAM_READWRITE));
} }

17
src/st/st-scroll-view.c
View File

@ -59,6 +59,7 @@
*/ */
#include "st-enum-types.h" #include "st-enum-types.h"
#include "st-private.h"
#include "st-scroll-view.h" #include "st-scroll-view.h"
#include "st-scroll-bar.h" #include "st-scroll-bar.h"
#include "st-scrollable.h" #include "st-scrollable.h"
@ -815,7 +816,7 @@ st_scroll_view_class_init (StScrollViewClass *klass)
"StScrollBar", "StScrollBar",
"Horizontal scroll indicator", "Horizontal scroll indicator",
ST_TYPE_SCROLL_BAR, ST_TYPE_SCROLL_BAR,
G_PARAM_READABLE)); ST_PARAM_READABLE));
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_VSCROLL, PROP_VSCROLL,
@ -823,7 +824,7 @@ st_scroll_view_class_init (StScrollViewClass *klass)
"StScrollBar", "StScrollBar",
"Vertical scroll indicator", "Vertical scroll indicator",
ST_TYPE_SCROLL_BAR, ST_TYPE_SCROLL_BAR,
G_PARAM_READABLE)); ST_PARAM_READABLE));
pspec = g_param_spec_enum ("vscrollbar-policy", pspec = g_param_spec_enum ("vscrollbar-policy",
@ -831,7 +832,7 @@ st_scroll_view_class_init (StScrollViewClass *klass)
"When the vertical scrollbar is displayed", "When the vertical scrollbar is displayed",
ST_TYPE_POLICY_TYPE, ST_TYPE_POLICY_TYPE,
ST_POLICY_AUTOMATIC, ST_POLICY_AUTOMATIC,
G_PARAM_READWRITE); ST_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_VSCROLLBAR_POLICY, pspec); g_object_class_install_property (object_class, PROP_VSCROLLBAR_POLICY, pspec);
pspec = g_param_spec_enum ("hscrollbar-policy", pspec = g_param_spec_enum ("hscrollbar-policy",
@ -839,28 +840,28 @@ st_scroll_view_class_init (StScrollViewClass *klass)
"When the horizontal scrollbar is displayed", "When the horizontal scrollbar is displayed",
ST_TYPE_POLICY_TYPE, ST_TYPE_POLICY_TYPE,
ST_POLICY_AUTOMATIC, ST_POLICY_AUTOMATIC,
G_PARAM_READWRITE); ST_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_HSCROLLBAR_POLICY, pspec); g_object_class_install_property (object_class, PROP_HSCROLLBAR_POLICY, pspec);
pspec = g_param_spec_boolean ("hscrollbar-visible", pspec = g_param_spec_boolean ("hscrollbar-visible",
"Horizontal Scrollbar Visibility", "Horizontal Scrollbar Visibility",
"Whether the horizontal scrollbar is visible", "Whether the horizontal scrollbar is visible",
TRUE, TRUE,
G_PARAM_READABLE); ST_PARAM_READABLE);
g_object_class_install_property (object_class, PROP_HSCROLLBAR_VISIBLE, pspec); g_object_class_install_property (object_class, PROP_HSCROLLBAR_VISIBLE, pspec);
pspec = g_param_spec_boolean ("vscrollbar-visible", pspec = g_param_spec_boolean ("vscrollbar-visible",
"Vertical Scrollbar Visibility", "Vertical Scrollbar Visibility",
"Whether the vertical scrollbar is visible", "Whether the vertical scrollbar is visible",
TRUE, TRUE,
G_PARAM_READABLE); ST_PARAM_READABLE);
g_object_class_install_property (object_class, PROP_VSCROLLBAR_VISIBLE, pspec); g_object_class_install_property (object_class, PROP_VSCROLLBAR_VISIBLE, pspec);
pspec = g_param_spec_boolean ("enable-mouse-scrolling", pspec = g_param_spec_boolean ("enable-mouse-scrolling",
"Enable Mouse Scrolling", "Enable Mouse Scrolling",
"Enable automatic mouse wheel scrolling", "Enable automatic mouse wheel scrolling",
TRUE, TRUE,
G_PARAM_READWRITE); ST_PARAM_READWRITE);
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_MOUSE_SCROLL, PROP_MOUSE_SCROLL,
pspec); pspec);
@ -869,7 +870,7 @@ st_scroll_view_class_init (StScrollViewClass *klass)
"Use Overlay Scrollbars", "Use Overlay Scrollbars",
"Overlay scrollbars over the content", "Overlay scrollbars over the content",
FALSE, FALSE,
G_PARAM_READWRITE); ST_PARAM_READWRITE);
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_OVERLAY_SCROLLBARS, PROP_OVERLAY_SCROLLBARS,
pspec); pspec);

5
src/st/st-scrollable.c
View File

@ -19,6 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "st-private.h"
#include "st-scrollable.h" #include "st-scrollable.h"
G_DEFINE_INTERFACE (StScrollable, st_scrollable, G_TYPE_OBJECT) G_DEFINE_INTERFACE (StScrollable, st_scrollable, G_TYPE_OBJECT)
@ -90,14 +91,14 @@ st_scrollable_default_init (StScrollableInterface *g_iface)
"StAdjustment", "StAdjustment",
"Horizontal adjustment", "Horizontal adjustment",
ST_TYPE_ADJUSTMENT, ST_TYPE_ADJUSTMENT,
G_PARAM_READWRITE)); ST_PARAM_READWRITE));
g_object_interface_install_property (g_iface, g_object_interface_install_property (g_iface,
g_param_spec_object ("vadjustment", g_param_spec_object ("vadjustment",
"StAdjustment", "StAdjustment",
"Vertical adjustment", "Vertical adjustment",
ST_TYPE_ADJUSTMENT, ST_TYPE_ADJUSTMENT,
G_PARAM_READWRITE)); ST_PARAM_READWRITE));
initialized = TRUE; initialized = TRUE;
} }

13
src/st/st-settings.c
View File

@ -23,6 +23,7 @@
#include <gio/gio.h> #include <gio/gio.h>
#include "st-private.h"
#include "st-settings.h" #include "st-settings.h"
#define KEY_ENABLE_ANIMATIONS "enable-animations" #define KEY_ENABLE_ANIMATIONS "enable-animations"
@ -130,32 +131,32 @@ st_settings_class_init (StSettingsClass *klass)
"Enable animations", "Enable animations",
"Enable animations", "Enable animations",
TRUE, TRUE,
G_PARAM_READABLE); ST_PARAM_READABLE);
props[PROP_PRIMARY_PASTE] = g_param_spec_boolean ("primary-paste", props[PROP_PRIMARY_PASTE] = g_param_spec_boolean ("primary-paste",
"Primary paste", "Primary paste",
"Primary paste", "Primary paste",
TRUE, TRUE,
G_PARAM_READABLE); ST_PARAM_READABLE);
props[PROP_DRAG_THRESHOLD] = g_param_spec_int ("drag-threshold", props[PROP_DRAG_THRESHOLD] = g_param_spec_int ("drag-threshold",
"Drag threshold", "Drag threshold",
"Drag threshold", "Drag threshold",
0, G_MAXINT, 8, 0, G_MAXINT, 8,
G_PARAM_READABLE); ST_PARAM_READABLE);
props[PROP_GTK_THEME] = g_param_spec_string ("gtk-theme", props[PROP_GTK_THEME] = g_param_spec_string ("gtk-theme",
"GTK+ Theme", "GTK+ Theme",
"GTK+ Theme", "GTK+ Theme",
"", "",
G_PARAM_READABLE); ST_PARAM_READABLE);
props[PROP_GTK_ICON_THEME] = g_param_spec_string ("gtk-icon-theme", props[PROP_GTK_ICON_THEME] = g_param_spec_string ("gtk-icon-theme",
"GTK+ Icon Theme", "GTK+ Icon Theme",
"GTK+ Icon Theme", "GTK+ Icon Theme",
"", "",
G_PARAM_READABLE); ST_PARAM_READABLE);
props[PROP_MAGNIFIER_ACTIVE] = g_param_spec_boolean("magnifier-active", props[PROP_MAGNIFIER_ACTIVE] = g_param_spec_boolean("magnifier-active",
"Magnifier is active", "Magnifier is active",
"Weather the a11y magnifier is active", "Weather the a11y magnifier is active",
FALSE, FALSE,
G_PARAM_READABLE); ST_PARAM_READABLE);
g_object_class_install_properties (object_class, N_PROPS, props); g_object_class_install_properties (object_class, N_PROPS, props);
} }

3
src/st/st-theme-context.c
View File

@ -21,6 +21,7 @@
#include <config.h> #include <config.h>
#include "st-private.h"
#include "st-texture-cache.h" #include "st-texture-cache.h"
#include "st-theme.h" #include "st-theme.h"
#include "st-theme-context.h" #include "st-theme-context.h"
@ -114,7 +115,7 @@ st_theme_context_class_init (StThemeContextClass *klass)
"Scale factor", "Scale factor",
"Integer scale factor used for high dpi scaling", "Integer scale factor used for high dpi scaling",
0, G_MAXINT, 1, 0, G_MAXINT, 1,
G_PARAM_READABLE | G_PARAM_WRITABLE)); ST_PARAM_READWRITE));
signals[CHANGED] = signals[CHANGED] =
g_signal_new ("changed", g_signal_new ("changed",

7
src/st/st-theme.c
View File

@ -42,6 +42,7 @@
#include <gio/gio.h> #include <gio/gio.h>
#include "st-private.h"
#include "st-theme-node.h" #include "st-theme-node.h"
#include "st-theme-private.h" #include "st-theme-private.h"
@ -136,7 +137,7 @@ st_theme_class_init (StThemeClass *klass)
"Application Stylesheet", "Application Stylesheet",
"Stylesheet with application-specific styling", "Stylesheet with application-specific styling",
G_TYPE_FILE, G_TYPE_FILE,
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); ST_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
/** /**
* StTheme:theme-stylesheet: * StTheme:theme-stylesheet:
@ -150,7 +151,7 @@ st_theme_class_init (StThemeClass *klass)
"Theme Stylesheet", "Theme Stylesheet",
"Stylesheet with theme-specific styling", "Stylesheet with theme-specific styling",
G_TYPE_FILE, G_TYPE_FILE,
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); ST_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
/** /**
* StTheme:default-stylesheet: * StTheme:default-stylesheet:
@ -164,7 +165,7 @@ st_theme_class_init (StThemeClass *klass)
"Default Stylesheet", "Default Stylesheet",
"Stylesheet with global default styling", "Stylesheet with global default styling",
G_TYPE_FILE, G_TYPE_FILE,
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); ST_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
signals[STYLESHEETS_CHANGED] = signals[STYLESHEETS_CHANGED] =
g_signal_new ("custom-stylesheets-changed", g_signal_new ("custom-stylesheets-changed",

2
src/st/st-widget.c
View File

@ -989,7 +989,7 @@ st_widget_class_init (StWidgetClass *klass)
"The accessible role of this object", "The accessible role of this object",
ATK_TYPE_ROLE, ATK_TYPE_ROLE,
ATK_ROLE_INVALID, ATK_ROLE_INVALID,
G_PARAM_READWRITE)); ST_PARAM_READWRITE));
/** /**

6
src/tray/na-tray-manager.c
View File

@ -129,10 +129,8 @@ na_tray_manager_class_init (NaTrayManagerClass *klass)
GTK_TYPE_ORIENTATION, GTK_TYPE_ORIENTATION,
GTK_ORIENTATION_HORIZONTAL, GTK_ORIENTATION_HORIZONTAL,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS |
G_PARAM_STATIC_NAME | G_PARAM_CONSTRUCT));
G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB));
manager_signals[TRAY_ICON_ADDED] = manager_signals[TRAY_ICON_ADDED] =
g_signal_new ("tray_icon_added", g_signal_new ("tray_icon_added",