diff options
| author | Pablo Barciela <[email protected]> | 2019-08-18 16:34:51 +0200 |
|---|---|---|
| committer | Victor Kareh <[email protected]> | 2019-08-20 09:01:31 -0400 |
| commit | f3eb01ac8e265c2d65d97565d526f101f835d7ea (patch) | |
| tree | eef281ab7b7d4b12487dc2f8c5c94d4c126b789a | |
| parent | 7e2ed0694af07d48a41f85fdacd75b44d3050041 (diff) | |
| download | mate-settings-daemon-f3eb01ac8e265c2d65d97565d526f101f835d7ea.tar.bz2 mate-settings-daemon-f3eb01ac8e265c2d65d97565d526f101f835d7ea.tar.xz | |
msd-xsettings-manager: avoid 'g_type_class_add_private'
| -rw-r--r-- | plugins/xsettings/msd-xsettings-manager.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/plugins/xsettings/msd-xsettings-manager.c b/plugins/xsettings/msd-xsettings-manager.c index b31288d..cba7993 100644 --- a/plugins/xsettings/msd-xsettings-manager.c +++ b/plugins/xsettings/msd-xsettings-manager.c @@ -45,8 +45,6 @@ #include "fontconfig-monitor.h" #include "wm-common.h" -#define MATE_XSETTINGS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MATE_TYPE_XSETTINGS_MANAGER, MateXSettingsManagerPrivate)) - #define MOUSE_SCHEMA "org.mate.peripherals-mouse" #define INTERFACE_SCHEMA "org.mate.interface" #define SOUND_SCHEMA "org.mate.sound" @@ -116,7 +114,7 @@ static void mate_xsettings_manager_class_init (MateXSettingsManagerClass *k static void mate_xsettings_manager_init (MateXSettingsManager *xsettings_manager); static void mate_xsettings_manager_finalize (GObject *object); -G_DEFINE_TYPE (MateXSettingsManager, mate_xsettings_manager, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (MateXSettingsManager, mate_xsettings_manager, G_TYPE_OBJECT) static gpointer manager_object = NULL; @@ -1015,14 +1013,12 @@ mate_xsettings_manager_class_init (MateXSettingsManagerClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->finalize = mate_xsettings_manager_finalize; - - g_type_class_add_private (klass, sizeof (MateXSettingsManagerPrivate)); } static void mate_xsettings_manager_init (MateXSettingsManager *manager) { - manager->priv = MATE_XSETTINGS_MANAGER_GET_PRIVATE (manager); + manager->priv = mate_xsettings_manager_get_instance_private (manager); } static void |