Remove deprecated private data macros

Replace them all with a combination of G_DEFINE_TYPE_WITH_PRIVATE() or
G_ADD_PRIVATE(), and foo_bar_get_instance_private().

10 files changed, 23 insertions, 51 deletions

diff --git a/libgnome-desktop/gnome-bg-crossfade.c b/libgnome-desktop/gnome-bg-crossfade.c
index 2c112d0a..77098423 100644
--- a/libgnome-desktop/gnome-bg-crossfade.c
+++ b/libgnome-desktop/gnome-bg-crossfade.c
@@ -65,10 +65,7 @@ enum {
 
 static guint signals[NUMBER_OF_SIGNALS] = { 0 };
 
-G_DEFINE_TYPE (GnomeBGCrossfade, gnome_bg_crossfade, G_TYPE_OBJECT)
-#define GNOME_BG_CROSSFADE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),\
-			                   GNOME_TYPE_BG_CROSSFADE,\
-			                   GnomeBGCrossfadePrivate))
+G_DEFINE_TYPE_WITH_PRIVATE (GnomeBGCrossfade, gnome_bg_crossfade, G_TYPE_OBJECT)
 
 static void
 gnome_bg_crossfade_set_property (GObject      *object,
@@ -195,14 +192,12 @@ gnome_bg_crossfade_class_init (GnomeBGCrossfadeClass *fade_class)
 					  G_SIGNAL_RUN_LAST, 0, NULL, NULL,
 					  g_cclosure_marshal_VOID__OBJECT,
 					  G_TYPE_NONE, 1, G_TYPE_OBJECT);
-
-	g_type_class_add_private (gobject_class, sizeof (GnomeBGCrossfadePrivate));
 }
 
 static void
 gnome_bg_crossfade_init (GnomeBGCrossfade *fade)
 {
-	fade->priv = GNOME_BG_CROSSFADE_GET_PRIVATE (fade);
+	fade->priv = gnome_bg_crossfade_get_instance_private (fade);
 
 	fade->priv->fading_surface = NULL;
 	fade->priv->end_surface = NULL;
diff --git a/libgnome-desktop/gnome-bg-slide-show.c b/libgnome-desktop/gnome-bg-slide-show.c
index bc42e5cc..cad3cb6c 100644
--- a/libgnome-desktop/gnome-bg-slide-show.c
+++ b/libgnome-desktop/gnome-bg-slide-show.c
@@ -73,10 +73,7 @@ enum {
         PROP_HAS_MULTIPLE_SIZES,
 };
 
-G_DEFINE_TYPE (GnomeBGSlideShow, gnome_bg_slide_show, G_TYPE_OBJECT)
-#define GNOME_BG_SLIDE_SHOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),\
-                                            GNOME_BG_TYPE_SLIDE_SHOW,\
-                                            GnomeBGSlideShowPrivate))
+G_DEFINE_TYPE_WITH_PRIVATE (GnomeBGSlideShow, gnome_bg_slide_show, G_TYPE_OBJECT)
 
 static void
 gnome_bg_slide_show_set_property (GObject       *object,
@@ -214,14 +211,12 @@ gnome_bg_slide_show_class_init (GnomeBGSlideShowClass *self_class)
                                                                "Has multiple sizes",
                                                                FALSE,
                                                                G_PARAM_READABLE));
-
-        g_type_class_add_private (gobject_class, sizeof (GnomeBGSlideShowPrivate));
 }
 
 static void
 gnome_bg_slide_show_init (GnomeBGSlideShow *self)
 {
-        self->priv = GNOME_BG_SLIDE_SHOW_GET_PRIVATE (self);
+        self->priv = gnome_bg_slide_show_get_instance_private (self);
 
         self->priv->stack = g_queue_new ();
         self->priv->slides = g_queue_new ();
diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c
index 566fbeb8..ad031c25 100644
--- a/libgnome-desktop/gnome-desktop-thumbnail.c
+++ b/libgnome-desktop/gnome-desktop-thumbnail.c
@@ -158,14 +158,12 @@ struct _GnomeDesktopThumbnailFactoryPrivate {
 
 static const char *appname = "gnome-thumbnail-factory";
 
-G_DEFINE_TYPE (GnomeDesktopThumbnailFactory,
+G_DEFINE_TYPE_WITH_CODE (GnomeDesktopThumbnailFactory,
 	       gnome_desktop_thumbnail_factory,
-	       G_TYPE_OBJECT)
+	       G_TYPE_OBJECT,
+	       G_ADD_PRIVATE (GnomeDesktopThumbnailFactory))
 #define parent_class gnome_desktop_thumbnail_factory_parent_class
 
-#define GNOME_DESKTOP_THUMBNAIL_FACTORY_GET_PRIVATE(object) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((object), GNOME_DESKTOP_TYPE_THUMBNAIL_FACTORY, GnomeDesktopThumbnailFactoryPrivate))
-
 #define THUMBNAILER_ENTRY_GROUP "Thumbnailer Entry"
 #define THUMBNAILER_EXTENSION   ".thumbnailer"
 
@@ -628,7 +626,7 @@ gnome_desktop_thumbnail_factory_init (GnomeDesktopThumbnailFactory *factory)
 {
   GnomeDesktopThumbnailFactoryPrivate *priv;
 
-  factory->priv = GNOME_DESKTOP_THUMBNAIL_FACTORY_GET_PRIVATE (factory);
+  factory->priv = gnome_desktop_thumbnail_factory_get_instance_private (factory);
 
   priv = factory->priv;
 
@@ -707,8 +705,6 @@ gnome_desktop_thumbnail_factory_class_init (GnomeDesktopThumbnailFactoryClass *c
   gobject_class = G_OBJECT_CLASS (class);
 
   gobject_class->finalize = gnome_desktop_thumbnail_factory_finalize;
-
-  g_type_class_add_private (class, sizeof (GnomeDesktopThumbnailFactoryPrivate));
 }
 
 /**
diff --git a/libgnome-desktop/gnome-idle-monitor.c b/libgnome-desktop/gnome-idle-monitor.c
index 9dc90434..d7583a2b 100644
--- a/libgnome-desktop/gnome-idle-monitor.c
+++ b/libgnome-desktop/gnome-idle-monitor.c
@@ -35,8 +35,6 @@
 #include "gnome-idle-monitor.h"
 #include "meta-dbus-idle-monitor.h"
 
-#define GNOME_IDLE_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_IDLE_MONITOR, GnomeIdleMonitorPrivate))
-
 G_STATIC_ASSERT(sizeof(unsigned long) == sizeof(gpointer));
 
 struct _GnomeIdleMonitorPrivate
@@ -81,6 +79,7 @@ static void add_idle_watch (GnomeIdleMonitor *, GnomeIdleMonitorWatch *);
 static void add_active_watch (GnomeIdleMonitor *, GnomeIdleMonitorWatch *);
 
 G_DEFINE_TYPE_WITH_CODE (GnomeIdleMonitor, gnome_idle_monitor, G_TYPE_OBJECT,
+			 G_ADD_PRIVATE (GnomeIdleMonitor)
 			 G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
 						gnome_idle_monitor_initable_iface_init))
 
@@ -394,14 +393,12 @@ gnome_idle_monitor_class_init (GnomeIdleMonitorClass *klass)
 				     GDK_TYPE_DEVICE,
 				     G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
 	g_object_class_install_property (object_class, PROP_DEVICE, obj_props[PROP_DEVICE]);
-
-	g_type_class_add_private (klass, sizeof (GnomeIdleMonitorPrivate));
 }
 
 static void
 gnome_idle_monitor_init (GnomeIdleMonitor *monitor)
 {
-	monitor->priv = GNOME_IDLE_MONITOR_GET_PRIVATE (monitor);
+	monitor->priv = gnome_idle_monitor_get_instance_private (monitor);
 
 	monitor->priv->watches = g_hash_table_new_full (NULL,
 							NULL,
diff --git a/libgnome-desktop/gnome-pnp-ids.c b/libgnome-desktop/gnome-pnp-ids.c
index 3a64cfc0..d251fa2b 100644
--- a/libgnome-desktop/gnome-pnp-ids.c
+++ b/libgnome-desktop/gnome-pnp-ids.c
@@ -27,8 +27,6 @@
 
 static void     gnome_pnp_ids_finalize     (GObject     *object);
 
-#define GNOME_PNP_IDS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_PNP_IDS, GnomePnpIdsPrivate))
-
 struct _GnomePnpIdsPrivate
 {
 #ifdef HAVE_UDEV
@@ -39,7 +37,7 @@ struct _GnomePnpIdsPrivate
 #endif /* HAVE_UDEV */
 };
 
-G_DEFINE_TYPE (GnomePnpIds, gnome_pnp_ids, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GnomePnpIds, gnome_pnp_ids, G_TYPE_OBJECT)
 
 /**
  * gnome_pnp_ids_get_pnp_id:
@@ -87,13 +85,12 @@ gnome_pnp_ids_class_init (GnomePnpIdsClass *klass)
 {
         GObjectClass *object_class = G_OBJECT_CLASS (klass);
         object_class->finalize = gnome_pnp_ids_finalize;
-        g_type_class_add_private (klass, sizeof (GnomePnpIdsPrivate));
 }
 
 static void
 gnome_pnp_ids_init (GnomePnpIds *pnp_ids)
 {
-        pnp_ids->priv = GNOME_PNP_IDS_GET_PRIVATE (pnp_ids);
+        pnp_ids->priv = gnome_pnp_ids_get_instance_private (pnp_ids);
 #ifdef HAVE_UDEV
         pnp_ids->priv->udev = udev_new();
         pnp_ids->priv->hwdb = udev_hwdb_new (pnp_ids->priv->udev);
diff --git a/libgnome-desktop/gnome-rr-config.c b/libgnome-desktop/gnome-rr-config.c
index 396f1f4d..610cb43c 100644
--- a/libgnome-desktop/gnome-rr-config.c
+++ b/libgnome-desktop/gnome-rr-config.c
@@ -89,12 +89,12 @@ enum {
   PROP_LAST
 };
 
-G_DEFINE_TYPE (GnomeRRConfig, gnome_rr_config, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GnomeRRConfig, gnome_rr_config, G_TYPE_OBJECT)
 
 static void
 gnome_rr_config_init (GnomeRRConfig *self)
 {
-    self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GNOME_TYPE_RR_CONFIG, GnomeRRConfigPrivate);
+    self->priv = gnome_rr_config_get_instance_private (self);
 
     self->priv->clone = FALSE;
     self->priv->screen = NULL;
@@ -273,8 +273,6 @@ gnome_rr_config_class_init (GnomeRRConfigClass *klass)
 {
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (GnomeRROutputInfoPrivate));
-
     gobject_class->set_property = gnome_rr_config_set_property;
     gobject_class->finalize = gnome_rr_config_finalize;
 
diff --git a/libgnome-desktop/gnome-rr-output-info.c b/libgnome-desktop/gnome-rr-output-info.c
index 08e9b45e..343e8dee 100644
--- a/libgnome-desktop/gnome-rr-output-info.c
+++ b/libgnome-desktop/gnome-rr-output-info.c
@@ -29,12 +29,12 @@
 
 #include "gnome-rr-private.h"
 
-G_DEFINE_TYPE (GnomeRROutputInfo, gnome_rr_output_info, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GnomeRROutputInfo, gnome_rr_output_info, G_TYPE_OBJECT)
 
 static void
 gnome_rr_output_info_init (GnomeRROutputInfo *self)
 {
-    self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GNOME_TYPE_RR_OUTPUT_INFO, GnomeRROutputInfoPrivate);
+    self->priv = gnome_rr_output_info_get_instance_private (self);
 
     self->priv->name = NULL;
     self->priv->on = FALSE;
@@ -63,8 +63,6 @@ gnome_rr_output_info_class_init (GnomeRROutputInfoClass *klass)
 {
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (GnomeRROutputInfoPrivate));
-
     gobject_class->finalize = gnome_rr_output_info_finalize;
 }
 
diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
index 96b5dfcc..11187aac 100644
--- a/libgnome-desktop/gnome-rr.c
+++ b/libgnome-desktop/gnome-rr.c
@@ -155,6 +155,7 @@ static gboolean gnome_rr_screen_initable_init (GInitable*, GCancellable*, GError
 static void gnome_rr_screen_initable_iface_init (GInitableIface *iface);
 static void gnome_rr_screen_async_initable_init (GAsyncInitableIface *iface);
 G_DEFINE_TYPE_WITH_CODE (GnomeRRScreen, gnome_rr_screen, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GnomeRRScreen)
                          G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gnome_rr_screen_initable_iface_init)
                          G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, gnome_rr_screen_async_initable_init))
 
@@ -873,7 +874,6 @@ void
 gnome_rr_screen_class_init (GnomeRRScreenClass *klass)
 {
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-    g_type_class_add_private (klass, sizeof (GnomeRRScreenPrivate));
 
     bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
     bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -979,8 +979,7 @@ gnome_rr_screen_class_init (GnomeRRScreenClass *klass)
 void
 gnome_rr_screen_init (GnomeRRScreen *self)
 {
-    GnomeRRScreenPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GNOME_TYPE_RR_SCREEN, GnomeRRScreenPrivate);
-    self->priv = priv;
+    self->priv = gnome_rr_screen_get_instance_private (self);
 }
 
 /* Weak reference callback set in gnome_rr_screen_new(); we remove the GObject data from the GdkScreen. */
diff --git a/libgnome-desktop/gnome-wall-clock.c b/libgnome-desktop/gnome-wall-clock.c
index f9083894..47d972de 100644
--- a/libgnome-desktop/gnome-wall-clock.c
+++ b/libgnome-desktop/gnome-wall-clock.c
@@ -52,7 +52,7 @@ enum {
 	PROP_TIME_ONLY,
 };
 
-G_DEFINE_TYPE (GnomeWallClock, gnome_wall_clock, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GnomeWallClock, gnome_wall_clock, G_TYPE_OBJECT);
 
 static gboolean update_clock (gpointer data);
 static void on_schema_change (GSettings *schema,
@@ -70,7 +70,7 @@ gnome_wall_clock_init (GnomeWallClock *self)
 {
 	GFile *tz;
 
-	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GNOME_TYPE_WALL_CLOCK, GnomeWallClockPrivate);
+	self->priv = gnome_wall_clock_get_instance_private (self);
 
 	self->priv->timezone = g_time_zone_new_local ();
 
@@ -202,8 +202,6 @@ gnome_wall_clock_class_init (GnomeWallClockClass *klass)
 							       "",
 							       FALSE,
 							       G_PARAM_READABLE | G_PARAM_WRITABLE));
-
-	g_type_class_add_private (gobject_class, sizeof (GnomeWallClockPrivate));
 }
 
 /* Replace 'target' with 'replacement' in the input string. */
diff --git a/libgnome-desktop/gnome-xkb-info.c b/libgnome-desktop/gnome-xkb-info.c
index d6dfaff8..3cd2c9b5 100644
--- a/libgnome-desktop/gnome-xkb-info.c
+++ b/libgnome-desktop/gnome-xkb-info.c
@@ -84,7 +84,8 @@ struct _GnomeXkbInfoPrivate
   gchar **current_parser_text;
 };
 
-G_DEFINE_TYPE (GnomeXkbInfo, gnome_xkb_info, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_CODE (GnomeXkbInfo, gnome_xkb_info, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GnomeXkbInfo));
 
 static void
 free_layout (gpointer data)
@@ -620,7 +621,7 @@ ensure_rules_are_parsed (GnomeXkbInfo *self)
 static void
 gnome_xkb_info_init (GnomeXkbInfo *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GNOME_TYPE_XKB_INFO, GnomeXkbInfoPrivate);
+  self->priv = gnome_xkb_info_get_instance_private (self);
 }
 
 static void
@@ -646,8 +647,6 @@ gnome_xkb_info_class_init (GnomeXkbInfoClass *klass)
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
   gobject_class->finalize = gnome_xkb_info_finalize;
-
-  g_type_class_add_private (gobject_class, sizeof (GnomeXkbInfoPrivate));
 }
 
 /**