From f7eb962919d338d2b64efb197eeb997ecf5770a2 Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Mon, 1 Jul 2019 16:30:08 +0800 Subject: plugins background: fix deprecated g_type_class_add_private --- plugins/background/msd-background-manager.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'plugins/background/msd-background-manager.c') diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c index b00ed6a..8755b76 100644 --- a/plugins/background/msd-background-manager.c +++ b/plugins/background/msd-background-manager.c @@ -49,8 +49,6 @@ #define MATE_SESSION_MANAGER_DBUS_NAME "org.gnome.SessionManager" #define MATE_SESSION_MANAGER_DBUS_PATH "/org/gnome/SessionManager" -#define MSD_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_BACKGROUND_MANAGER, MsdBackgroundManagerPrivate)) - struct MsdBackgroundManagerPrivate { GSettings *settings; MateBG *bg; @@ -69,7 +67,7 @@ struct MsdBackgroundManagerPrivate { guint proxy_signal_id; }; -G_DEFINE_TYPE (MsdBackgroundManager, msd_background_manager, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (MsdBackgroundManager, msd_background_manager, G_TYPE_OBJECT) static gpointer manager_object = NULL; @@ -566,7 +564,7 @@ msd_background_manager_finalize (GObject *object) static void msd_background_manager_init (MsdBackgroundManager* manager) { - manager->priv = MSD_BACKGROUND_MANAGER_GET_PRIVATE(manager); + manager->priv = msd_background_manager_get_instance_private(manager); } static void @@ -576,8 +574,6 @@ msd_background_manager_class_init (MsdBackgroundManagerClass *klass) object_class->constructor = msd_background_manager_constructor; object_class->finalize = msd_background_manager_finalize; - - g_type_class_add_private(klass, sizeof(MsdBackgroundManagerPrivate)); } MsdBackgroundManager* -- cgit v1.2.1