diff options
| author | Pablo Barciela <[email protected]> | 2019-09-16 10:29:32 +0200 |
|---|---|---|
| committer | Victor Kareh <[email protected]> | 2019-10-02 06:48:58 -0400 |
| commit | 940af962a0b412ea36d237c2c8d7fb24b1133b88 (patch) | |
| tree | 99da1d1e2e8d89269948d85c23048d9f75295e5b | |
| parent | 16f3cf40f76520d6e21b370205a6c72f5440b06d (diff) | |
| download | mate-screensaver-940af962a0b412ea36d237c2c8d7fb24b1133b88.tar.bz2 mate-screensaver-940af962a0b412ea36d237c2c8d7fb24b1133b88.tar.xz | |
gs_prefs: avoid 'g_type_class_add_private'
| -rw-r--r-- | src/gs-prefs.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/gs-prefs.c b/src/gs-prefs.c index df1267c..8761c18 100644 --- a/src/gs-prefs.c +++ b/src/gs-prefs.c @@ -57,8 +57,6 @@ static void gs_prefs_finalize (GObject *object); #define KEY_KEYBOARD_COMMAND "embedded-keyboard-command" #define KEY_STATUS_MESSAGE_ENABLED "status-message-enabled" -#define GS_PREFS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_PREFS, GSPrefsPrivate)) - struct GSPrefsPrivate { GSettings *settings; @@ -79,7 +77,7 @@ enum static guint signals [LAST_SIGNAL] = { 0, }; -G_DEFINE_TYPE (GSPrefs, gs_prefs, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (GSPrefs, gs_prefs, G_TYPE_OBJECT) static void gs_prefs_set_property (GObject *object, @@ -129,9 +127,6 @@ gs_prefs_class_init (GSPrefsClass *klass) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - - g_type_class_add_private (klass, sizeof (GSPrefsPrivate)); - } static void @@ -542,7 +537,7 @@ key_changed_cb (GSettings *settings, static void gs_prefs_init (GSPrefs *prefs) { - prefs->priv = GS_PREFS_GET_PRIVATE (prefs); + prefs->priv = gs_prefs_get_instance_private (prefs); prefs->priv->settings = g_settings_new (GSETTINGS_SCHEMA); g_signal_connect (prefs->priv->settings, |