[gnome-shell/wip/nielsdg/g-param-static-strings: 9/9] Ensure G_PARAM_STATIC_STRINGS for all properties
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/nielsdg/g-param-static-strings: 9/9] Ensure G_PARAM_STATIC_STRINGS for all properties
- Date: Mon, 29 Jul 2019 06:56:25 +0000 (UTC)
commit c086f3451b549f4f438d255f72c57c0d60eae85d
Author: Niels De Graef <nielsdegraef gmail com>
Date: Thu Jul 25 19:34:19 2019 +0200
Ensure G_PARAM_STATIC_STRINGS for all properties
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
src/hotplug-sniffer/shell-mime-sniffer.c | 2 +-
src/shell-app.c | 4 ++--
src/shell-global.c | 32 ++++++++++++++++----------------
src/shell-keyring-prompt.c | 12 ++++++------
src/shell-recorder-src.c | 4 ++--
src/shell-recorder.c | 12 ++++++------
src/shell-tray-icon.c | 6 +++---
src/shell-window-tracker.c | 2 +-
src/st/st-button.c | 14 +++++++++-----
src/st/st-entry.c | 18 ++++++++++--------
src/st/st-image-content.c | 5 +++--
src/st/st-label.c | 5 +++--
src/st/st-scroll-view-fade.c | 7 ++++---
src/st/st-scroll-view.c | 17 +++++++++--------
src/st/st-scrollable.c | 5 +++--
src/st/st-settings.c | 13 +++++++------
src/st/st-theme-context.c | 2 +-
src/st/st-theme.c | 6 +++---
src/st/st-widget.c | 2 +-
src/tray/na-tray-manager.c | 6 ++----
20 files changed, 92 insertions(+), 82 deletions(-)
---
diff --git a/src/hotplug-sniffer/shell-mime-sniffer.c b/src/hotplug-sniffer/shell-mime-sniffer.c
index 0792ab7bc..cf53579a0 100644
--- a/src/hotplug-sniffer/shell-mime-sniffer.c
+++ b/src/hotplug-sniffer/shell-mime-sniffer.c
@@ -543,7 +543,7 @@ shell_mime_sniffer_class_init (ShellMimeSnifferClass *klass)
"File",
"The loaded file",
G_TYPE_FILE,
- G_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_properties (oclass, NUM_PROPERTIES, properties);
}
diff --git a/src/shell-app.c b/src/shell-app.c
index e5569b25f..b8fd9384f 100644
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -1533,7 +1533,7 @@ shell_app_class_init(ShellAppClass *klass)
"Application state",
SHELL_TYPE_APP_STATE,
SHELL_APP_STATE_STOPPED,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* ShellApp:busy:
@@ -1546,7 +1546,7 @@ shell_app_class_init(ShellAppClass *klass)
"Busy",
"Busy state",
FALSE,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* ShellApp:id:
diff --git a/src/shell-global.c b/src/shell-global.c
index d8fd8046b..ca43257ad 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -365,7 +365,7 @@ shell_global_class_init (ShellGlobalClass *klass)
"Session Mode",
"The session mode to use",
"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,
PROP_SCREEN_WIDTH,
@@ -373,7 +373,7 @@ shell_global_class_init (ShellGlobalClass *klass)
"Screen Width",
"Screen width, in pixels",
0, G_MAXINT, 1,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_SCREEN_HEIGHT,
@@ -381,14 +381,14 @@ shell_global_class_init (ShellGlobalClass *klass)
"Screen Height",
"Screen height, in pixels",
0, G_MAXINT, 1,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_DISPLAY,
g_param_spec_object ("display",
"Display",
"Metacity display object for the shell",
META_TYPE_DISPLAY,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_WORKSPACE_MANAGER,
@@ -396,7 +396,7 @@ shell_global_class_init (ShellGlobalClass *klass)
"Workspace manager",
"Workspace manager",
META_TYPE_WORKSPACE_MANAGER,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_STAGE,
@@ -404,14 +404,14 @@ shell_global_class_init (ShellGlobalClass *klass)
"Stage",
"Stage holding the desktop scene graph",
CLUTTER_TYPE_ACTOR,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_WINDOW_GROUP,
g_param_spec_object ("window-group",
"Window Group",
"Actor holding window actors",
CLUTTER_TYPE_ACTOR,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_TOP_WINDOW_GROUP,
@@ -419,7 +419,7 @@ shell_global_class_init (ShellGlobalClass *klass)
"Top Window Group",
"Actor holding override-redirect windows",
CLUTTER_TYPE_ACTOR,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_WINDOW_MANAGER,
@@ -427,56 +427,56 @@ shell_global_class_init (ShellGlobalClass *klass)
"Window Manager",
"Window management interface",
SHELL_TYPE_WM,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_SETTINGS,
g_param_spec_object ("settings",
"Settings",
"GSettings instance for gnome-shell configuration",
G_TYPE_SETTINGS,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_DATADIR,
g_param_spec_string ("datadir",
"Data directory",
"Directory containing gnome-shell data files",
NULL,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_IMAGEDIR,
g_param_spec_string ("imagedir",
"Image directory",
"Directory containing gnome-shell image files",
NULL,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_USERDATADIR,
g_param_spec_string ("userdatadir",
"User data directory",
"Directory containing gnome-shell user data",
NULL,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_FOCUS_MANAGER,
g_param_spec_object ("focus-manager",
"Focus manager",
"The shell's StFocusManager",
ST_TYPE_FOCUS_MANAGER,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_FRAME_TIMESTAMPS,
g_param_spec_boolean ("frame-timestamps",
"Frame Timestamps",
"Whether to log frame timestamps in the performance
log",
FALSE,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_FRAME_FINISH_TIMESTAMP,
g_param_spec_boolean ("frame-finish-timestamp",
"Frame Finish Timestamps",
"Whether at the end of a frame to call glFinish and
log paintCompletedTimestamp",
FALSE,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
/*
diff --git a/src/shell-keyring-prompt.c b/src/shell-keyring-prompt.c
index 092c19ac5..ccf3ffb05 100644
--- a/src/shell-keyring-prompt.c
+++ b/src/shell-keyring-prompt.c
@@ -347,7 +347,7 @@ shell_keyring_prompt_class_init (ShellKeyringPromptClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_PASSWORD_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:
@@ -356,7 +356,7 @@ shell_keyring_prompt_class_init (ShellKeyringPromptClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_CONFIRM_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:
@@ -365,7 +365,7 @@ shell_keyring_prompt_class_init (ShellKeyringPromptClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_WARNING_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:
@@ -374,7 +374,7 @@ shell_keyring_prompt_class_init (ShellKeyringPromptClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_CHOICE_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:
@@ -383,7 +383,7 @@ shell_keyring_prompt_class_init (ShellKeyringPromptClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_PASSWORD_ACTOR,
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:
@@ -392,7 +392,7 @@ shell_keyring_prompt_class_init (ShellKeyringPromptClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_CONFIRM_ACTOR,
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),
0, 0, NULL, NULL,
diff --git a/src/shell-recorder-src.c b/src/shell-recorder-src.c
index 31cbe6f67..d1a164038 100644
--- a/src/shell-recorder-src.c
+++ b/src/shell-recorder-src.c
@@ -321,14 +321,14 @@ shell_recorder_src_class_init (ShellRecorderSrcClass *klass)
"Caps",
"Fixed GstCaps for the source",
GST_TYPE_CAPS,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (object_class,
PROP_MEMORY_USED,
g_param_spec_uint ("memory-used",
"Memory Used",
"Memory currently used by the queue (in kB)",
0, G_MAXUINT, 0,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&src_template));
diff --git a/src/shell-recorder.c b/src/shell-recorder.c
index cf1cc336f..cfafbaa0a 100644
--- a/src/shell-recorder.c
+++ b/src/shell-recorder.c
@@ -835,7 +835,7 @@ shell_recorder_class_init (ShellRecorderClass *klass)
"Display",
"Display to record",
META_TYPE_DISPLAY,
- G_PARAM_WRITABLE));
+ G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_STAGE,
@@ -843,7 +843,7 @@ shell_recorder_class_init (ShellRecorderClass *klass)
"Stage",
"Stage to record",
CLUTTER_TYPE_STAGE,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_FRAMERATE,
@@ -853,7 +853,7 @@ shell_recorder_class_init (ShellRecorderClass *klass)
0,
G_MAXINT,
DEFAULT_FRAMES_PER_SECOND,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_PIPELINE,
@@ -861,7 +861,7 @@ shell_recorder_class_init (ShellRecorderClass *klass)
"Pipeline",
"GStreamer pipeline description to encode
recordings",
NULL,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_FILE_TEMPLATE,
@@ -869,7 +869,7 @@ shell_recorder_class_init (ShellRecorderClass *klass)
"File Template",
"The filename template to use for output files",
NULL,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_DRAW_CURSOR,
@@ -877,7 +877,7 @@ shell_recorder_class_init (ShellRecorderClass *klass)
"Draw Cursor",
"Whether to record the cursor",
TRUE,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
/* Sets the GstCaps (video format, in this case) on the stream
diff --git a/src/shell-tray-icon.c b/src/shell-tray-icon.c
index c301d073d..14b219100 100644
--- a/src/shell-tray-icon.c
+++ b/src/shell-tray-icon.c
@@ -136,21 +136,21 @@ shell_tray_icon_class_init (ShellTrayIconClass *klass)
"PID",
"The PID of the icon's application",
0, G_MAXUINT, 0,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (object_class,
PROP_TITLE,
g_param_spec_string ("title",
"Title",
"The icon's window title",
NULL,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (object_class,
PROP_WM_CLASS,
g_param_spec_string ("wm-class",
"WM Class",
"The icon's window WM_CLASS",
NULL,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
}
static void
diff --git a/src/shell-window-tracker.c b/src/shell-window-tracker.c
index 487bc9b29..9ad8ecfba 100644
--- a/src/shell-window-tracker.c
+++ b/src/shell-window-tracker.c
@@ -103,7 +103,7 @@ shell_window_tracker_class_init (ShellWindowTrackerClass *klass)
"Focus App",
"Focused application",
SHELL_TYPE_APP,
- G_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
signals[STARTUP_SEQUENCE_CHANGED] = g_signal_new ("startup-sequence-changed",
SHELL_TYPE_WINDOW_TRACKER,
diff --git a/src/st/st-button.c b/src/st/st-button.c
index 3897c7c87..3af1811f7 100644
--- a/src/st/st-button.c
+++ b/src/st/st-button.c
@@ -479,33 +479,37 @@ st_button_class_init (StButtonClass *klass)
pspec = g_param_spec_string ("label",
"Label",
"Label of the button",
- NULL, G_PARAM_READWRITE);
+ NULL,
+ ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_LABEL, pspec);
pspec = g_param_spec_flags ("button-mask",
"Button mask",
"Which buttons trigger the 'clicked' signal",
ST_TYPE_BUTTON_MASK, ST_BUTTON_ONE,
- G_PARAM_READWRITE);
+ ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_BUTTON_MASK, pspec);
pspec = g_param_spec_boolean ("toggle-mode",
"Toggle Mode",
"Enable or disable toggling",
- FALSE, G_PARAM_READWRITE);
+ FALSE,
+ ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_TOGGLE_MODE, pspec);
pspec = g_param_spec_boolean ("checked",
"Checked",
"Indicates if a toggle button is \"on\""
" or \"off\"",
- FALSE, G_PARAM_READWRITE);
+ FALSE,
+ ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_CHECKED, pspec);
pspec = g_param_spec_boolean ("pressed",
"Pressed",
"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);
diff --git a/src/st/st-entry.c b/src/st/st-entry.c
index 2d1de36ef..13688d0b6 100644
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@@ -937,28 +937,29 @@ st_entry_class_init (StEntryClass *klass)
"Clutter Text",
"Internal ClutterText actor",
CLUTTER_TYPE_TEXT,
- G_PARAM_READABLE);
+ ST_PARAM_READABLE);
g_object_class_install_property (gobject_class, PROP_CLUTTER_TEXT, pspec);
pspec = g_param_spec_object ("primary-icon",
"Primary Icon",
"Primary Icon actor",
CLUTTER_TYPE_ACTOR,
- G_PARAM_READWRITE);
+ ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_PRIMARY_ICON, pspec);
pspec = g_param_spec_object ("secondary-icon",
"Secondary Icon",
"Secondary Icon actor",
CLUTTER_TYPE_ACTOR,
- G_PARAM_READWRITE);
+ ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_SECONDARY_ICON, pspec);
pspec = g_param_spec_string ("hint-text",
"Hint Text",
"Text to display when the entry is not focused "
"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);
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 "
"and the text property is empty",
CLUTTER_TYPE_ACTOR,
- G_PARAM_READWRITE);
+ ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_HINT_ACTOR, pspec);
pspec = g_param_spec_string ("text",
"Text",
"Text of the entry",
- NULL, G_PARAM_READWRITE);
+ NULL,
+ ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_TEXT, pspec);
pspec = g_param_spec_enum ("input-purpose",
@@ -980,7 +982,7 @@ st_entry_class_init (StEntryClass *klass)
"Purpose of the text field",
CLUTTER_TYPE_INPUT_CONTENT_PURPOSE,
CLUTTER_INPUT_CONTENT_PURPOSE_NORMAL,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class,
PROP_INPUT_PURPOSE,
pspec);
@@ -989,7 +991,7 @@ st_entry_class_init (StEntryClass *klass)
"hints",
"Hints for the text field behaviour",
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,
PROP_INPUT_HINTS,
pspec);
diff --git a/src/st/st-image-content.c b/src/st/st-image-content.c
index 6195fdc8f..bf4c5bfc5 100644
--- a/src/st/st-image-content.c
+++ b/src/st/st-image-content.c
@@ -19,6 +19,7 @@
*/
#include "st-image-content.h"
+#include "st-private.h"
struct _StImageContent
{
@@ -127,14 +128,14 @@ st_image_content_class_init (StImageContentClass *klass)
"Preferred Width",
"Preferred Width of the Content when painted",
-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);
pspec = g_param_spec_int ("preferred-height",
"Preferred Height",
"Preferred Height of the Content when painted",
-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);
}
diff --git a/src/st/st-label.c b/src/st/st-label.c
index ed68f67f5..ab05087d8 100644
--- a/src/st/st-label.c
+++ b/src/st/st-label.c
@@ -268,13 +268,14 @@ st_label_class_init (StLabelClass *klass)
"Clutter Text",
"Internal ClutterText actor",
CLUTTER_TYPE_TEXT,
- G_PARAM_READABLE);
+ ST_PARAM_READABLE);
g_object_class_install_property (gobject_class, PROP_CLUTTER_TEXT, pspec);
pspec = g_param_spec_string ("text",
"Text",
"Text of the label",
- NULL, G_PARAM_READWRITE);
+ NULL,
+ ST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_TEXT, pspec);
}
diff --git a/src/st/st-scroll-view-fade.c b/src/st/st-scroll-view-fade.c
index 3942cbcf0..cc4a2210b 100644
--- a/src/st/st-scroll-view-fade.c
+++ b/src/st/st-scroll-view-fade.c
@@ -19,6 +19,7 @@
*/
+#include "st-private.h"
#include "st-scroll-view-fade.h"
#include "st-scroll-view.h"
#include "st-widget.h"
@@ -389,21 +390,21 @@ st_scroll_view_fade_class_init (StScrollViewFadeClass *klass)
"Vertical Fade Offset",
"The height of the area which is faded at the edge",
0.f, G_MAXFLOAT, DEFAULT_FADE_OFFSET,
- G_PARAM_READWRITE));
+ ST_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_HFADE_OFFSET,
g_param_spec_float ("hfade-offset",
"Horizontal Fade Offset",
"The width of the area which is faded at the edge",
0.f, G_MAXFLOAT, DEFAULT_FADE_OFFSET,
- G_PARAM_READWRITE));
+ ST_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_FADE_EDGES,
g_param_spec_boolean ("fade-edges",
"Fade Edges",
"Whether the faded area should extend to the edges",
FALSE,
- G_PARAM_READWRITE));
+ ST_PARAM_READWRITE));
}
diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c
index 1a83ad445..f6a2ac973 100644
--- a/src/st/st-scroll-view.c
+++ b/src/st/st-scroll-view.c
@@ -59,6 +59,7 @@
*/
#include "st-enum-types.h"
+#include "st-private.h"
#include "st-scroll-view.h"
#include "st-scroll-bar.h"
#include "st-scrollable.h"
@@ -815,7 +816,7 @@ st_scroll_view_class_init (StScrollViewClass *klass)
"StScrollBar",
"Horizontal scroll indicator",
ST_TYPE_SCROLL_BAR,
- G_PARAM_READABLE));
+ ST_PARAM_READABLE));
g_object_class_install_property (object_class,
PROP_VSCROLL,
@@ -823,7 +824,7 @@ st_scroll_view_class_init (StScrollViewClass *klass)
"StScrollBar",
"Vertical scroll indicator",
ST_TYPE_SCROLL_BAR,
- G_PARAM_READABLE));
+ ST_PARAM_READABLE));
pspec = g_param_spec_enum ("vscrollbar-policy",
@@ -831,7 +832,7 @@ st_scroll_view_class_init (StScrollViewClass *klass)
"When the vertical scrollbar is displayed",
ST_TYPE_POLICY_TYPE,
ST_POLICY_AUTOMATIC,
- G_PARAM_READWRITE);
+ ST_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_VSCROLLBAR_POLICY, pspec);
pspec = g_param_spec_enum ("hscrollbar-policy",
@@ -839,28 +840,28 @@ st_scroll_view_class_init (StScrollViewClass *klass)
"When the horizontal scrollbar is displayed",
ST_TYPE_POLICY_TYPE,
ST_POLICY_AUTOMATIC,
- G_PARAM_READWRITE);
+ ST_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_HSCROLLBAR_POLICY, pspec);
pspec = g_param_spec_boolean ("hscrollbar-visible",
"Horizontal Scrollbar Visibility",
"Whether the horizontal scrollbar is visible",
TRUE,
- G_PARAM_READABLE);
+ ST_PARAM_READABLE);
g_object_class_install_property (object_class, PROP_HSCROLLBAR_VISIBLE, pspec);
pspec = g_param_spec_boolean ("vscrollbar-visible",
"Vertical Scrollbar Visibility",
"Whether the vertical scrollbar is visible",
TRUE,
- G_PARAM_READABLE);
+ ST_PARAM_READABLE);
g_object_class_install_property (object_class, PROP_VSCROLLBAR_VISIBLE, pspec);
pspec = g_param_spec_boolean ("enable-mouse-scrolling",
"Enable Mouse Scrolling",
"Enable automatic mouse wheel scrolling",
TRUE,
- G_PARAM_READWRITE);
+ ST_PARAM_READWRITE);
g_object_class_install_property (object_class,
PROP_MOUSE_SCROLL,
pspec);
@@ -869,7 +870,7 @@ st_scroll_view_class_init (StScrollViewClass *klass)
"Use Overlay Scrollbars",
"Overlay scrollbars over the content",
FALSE,
- G_PARAM_READWRITE);
+ ST_PARAM_READWRITE);
g_object_class_install_property (object_class,
PROP_OVERLAY_SCROLLBARS,
pspec);
diff --git a/src/st/st-scrollable.c b/src/st/st-scrollable.c
index d0a8ed09d..234318274 100644
--- a/src/st/st-scrollable.c
+++ b/src/st/st-scrollable.c
@@ -19,6 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "st-private.h"
#include "st-scrollable.h"
G_DEFINE_INTERFACE (StScrollable, st_scrollable, G_TYPE_OBJECT)
@@ -90,14 +91,14 @@ st_scrollable_default_init (StScrollableInterface *g_iface)
"StAdjustment",
"Horizontal adjustment",
ST_TYPE_ADJUSTMENT,
- G_PARAM_READWRITE));
+ ST_PARAM_READWRITE));
g_object_interface_install_property (g_iface,
g_param_spec_object ("vadjustment",
"StAdjustment",
"Vertical adjustment",
ST_TYPE_ADJUSTMENT,
- G_PARAM_READWRITE));
+ ST_PARAM_READWRITE));
initialized = TRUE;
}
diff --git a/src/st/st-settings.c b/src/st/st-settings.c
index 17f2c466e..a90e9f1b1 100644
--- a/src/st/st-settings.c
+++ b/src/st/st-settings.c
@@ -23,6 +23,7 @@
#include <gio/gio.h>
+#include "st-private.h"
#include "st-settings.h"
#define KEY_ENABLE_ANIMATIONS "enable-animations"
@@ -130,32 +131,32 @@ st_settings_class_init (StSettingsClass *klass)
"Enable animations",
"Enable animations",
TRUE,
- G_PARAM_READABLE);
+ ST_PARAM_READABLE);
props[PROP_PRIMARY_PASTE] = g_param_spec_boolean ("primary-paste",
"Primary paste",
"Primary paste",
TRUE,
- G_PARAM_READABLE);
+ ST_PARAM_READABLE);
props[PROP_DRAG_THRESHOLD] = g_param_spec_int ("drag-threshold",
"Drag threshold",
"Drag threshold",
0, G_MAXINT, 8,
- G_PARAM_READABLE);
+ ST_PARAM_READABLE);
props[PROP_GTK_THEME] = g_param_spec_string ("gtk-theme",
"GTK+ Theme",
"GTK+ Theme",
"",
- G_PARAM_READABLE);
+ ST_PARAM_READABLE);
props[PROP_GTK_ICON_THEME] = g_param_spec_string ("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",
"Magnifier is active",
"Weather the a11y magnifier is active",
FALSE,
- G_PARAM_READABLE);
+ ST_PARAM_READABLE);
g_object_class_install_properties (object_class, N_PROPS, props);
}
diff --git a/src/st/st-theme-context.c b/src/st/st-theme-context.c
index 4916d8945..4a29cc3b0 100644
--- a/src/st/st-theme-context.c
+++ b/src/st/st-theme-context.c
@@ -114,7 +114,7 @@ st_theme_context_class_init (StThemeContextClass *klass)
"Scale factor",
"Integer scale factor used for high dpi scaling",
0, G_MAXINT, 1,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ ST_PARAM_READWRITE));
signals[CHANGED] =
g_signal_new ("changed",
diff --git a/src/st/st-theme.c b/src/st/st-theme.c
index b567f7e5e..51af03fce 100644
--- a/src/st/st-theme.c
+++ b/src/st/st-theme.c
@@ -136,7 +136,7 @@ st_theme_class_init (StThemeClass *klass)
"Application Stylesheet",
"Stylesheet with application-specific styling",
G_TYPE_FILE,
- G_PARAM_READABLE | G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY));
+ ST_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
/**
* StTheme:theme-stylesheet:
@@ -150,7 +150,7 @@ st_theme_class_init (StThemeClass *klass)
"Theme Stylesheet",
"Stylesheet with theme-specific styling",
G_TYPE_FILE,
- G_PARAM_READABLE | G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY));
+ ST_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
/**
* StTheme:default-stylesheet:
@@ -164,7 +164,7 @@ st_theme_class_init (StThemeClass *klass)
"Default Stylesheet",
"Stylesheet with global default styling",
G_TYPE_FILE,
- G_PARAM_READABLE | G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY));
+ ST_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
signals[STYLESHEETS_CHANGED] =
g_signal_new ("custom-stylesheets-changed",
diff --git a/src/st/st-widget.c b/src/st/st-widget.c
index 2b770b52e..63e3ab9d1 100644
--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@@ -989,7 +989,7 @@ st_widget_class_init (StWidgetClass *klass)
"The accessible role of this object",
ATK_TYPE_ROLE,
ATK_ROLE_INVALID,
- G_PARAM_READWRITE));
+ ST_PARAM_READWRITE));
/**
diff --git a/src/tray/na-tray-manager.c b/src/tray/na-tray-manager.c
index aea42eea2..15e1d80ec 100644
--- a/src/tray/na-tray-manager.c
+++ b/src/tray/na-tray-manager.c
@@ -129,10 +129,8 @@ na_tray_manager_class_init (NaTrayManagerClass *klass)
GTK_TYPE_ORIENTATION,
GTK_ORIENTATION_HORIZONTAL,
G_PARAM_READWRITE |
- G_PARAM_CONSTRUCT |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB));
+ G_PARAM_STATIC_STRINGS |
+ G_PARAM_CONSTRUCT));
manager_signals[TRAY_ICON_ADDED] =
g_signal_new ("tray_icon_added",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
