[Xfce4-commits] [apps/xfce4-screensaver] 393/425: Reduce usage of deprecated g_type_class_add_private

noreply at xfce.org noreply at xfce.org
Mon Oct 15 01:54:00 CEST 2018


This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit 8750426286198d1cd2b0a54f4ea53c65a6e6b154
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Thu Oct 11 07:00:45 2018 -0400

    Reduce usage of deprecated g_type_class_add_private
---
 savers/gs-theme-engine.c |  8 ++------
 savers/gste-popsquares.c |  8 ++------
 savers/gste-slideshow.c  |  8 ++------
 src/gs-fade.c            |  8 ++------
 src/gs-grab-x11.c        | 10 +++-------
 src/gs-job.c             |  8 ++------
 src/gs-listener-dbus.c   |  8 ++------
 src/gs-lock-plug.c       | 10 +++-------
 src/gs-manager.c         |  8 ++------
 src/gs-monitor.c         |  9 ++-------
 src/gs-prefs.c           |  9 ++-------
 src/gs-theme-manager.c   |  8 ++------
 src/gs-watcher-x11.c     |  8 ++------
 src/gs-window-x11.c      |  8 ++------
 14 files changed, 30 insertions(+), 88 deletions(-)

diff --git a/savers/gs-theme-engine.c b/savers/gs-theme-engine.c
index 84c3682..a4e4780 100644
--- a/savers/gs-theme-engine.c
+++ b/savers/gs-theme-engine.c
@@ -40,11 +40,9 @@ struct GSThemeEnginePrivate
 	gpointer reserved;
 };
 
-#define GS_THEME_ENGINE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_THEME_ENGINE, GSThemeEnginePrivate))
-
 static GObjectClass *parent_class = NULL;
 
-G_DEFINE_ABSTRACT_TYPE (GSThemeEngine, gs_theme_engine, GTK_TYPE_DRAWING_AREA)
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GSThemeEngine, gs_theme_engine, GTK_TYPE_DRAWING_AREA)
 
 void
 _gs_theme_engine_profile_log (const char *func,
@@ -131,14 +129,12 @@ gs_theme_engine_class_init (GSThemeEngineClass *klass)
 	object_class->set_property = gs_theme_engine_set_property;
 
 	widget_class->draw = gs_theme_engine_real_draw;
-
-	g_type_class_add_private (klass, sizeof (GSThemeEnginePrivate));
 }
 
 static void
 gs_theme_engine_init (GSThemeEngine *engine)
 {
-	engine->priv = GS_THEME_ENGINE_GET_PRIVATE (engine);
+	engine->priv = gs_theme_engine_get_instance_private (engine);
 }
 
 static void
diff --git a/savers/gste-popsquares.c b/savers/gste-popsquares.c
index 90b8b2d..37e8bac 100644
--- a/savers/gste-popsquares.c
+++ b/savers/gste-popsquares.c
@@ -55,11 +55,9 @@ struct GSTEPopsquaresPrivate
 	square    *squares;
 };
 
-#define GSTE_POPSQUARES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSTE_TYPE_POPSQUARES, GSTEPopsquaresPrivate))
-
 static GObjectClass *parent_class = NULL;
 
-G_DEFINE_TYPE (GSTEPopsquares, gste_popsquares, GS_TYPE_THEME_ENGINE)
+G_DEFINE_TYPE_WITH_PRIVATE (GSTEPopsquares, gste_popsquares, GS_TYPE_THEME_ENGINE)
 
 static void
 hsv_to_rgb (int     h,
@@ -506,8 +504,6 @@ gste_popsquares_class_init (GSTEPopsquaresClass *klass)
 	widget_class->show = gste_popsquares_real_show;
 	widget_class->draw = gste_popsquares_real_draw;
 	widget_class->configure_event = gste_popsquares_real_configure;
-
-	g_type_class_add_private (klass, sizeof (GSTEPopsquaresPrivate));
 }
 
 static void
@@ -578,7 +574,7 @@ gste_popsquares_init (GSTEPopsquares *pop)
 {
 	int delay;
 
-	pop->priv = GSTE_POPSQUARES_GET_PRIVATE (pop);
+	pop->priv = gste_popsquares_get_instance_private (pop);
 
 	pop->priv->ncolors = 128;
 	pop->priv->subdivision = 5;
diff --git a/savers/gste-slideshow.c b/savers/gste-slideshow.c
index 1caf75b..e131d29 100644
--- a/savers/gste-slideshow.c
+++ b/savers/gste-slideshow.c
@@ -87,11 +87,9 @@ enum
     PROP_NO_STRETCH_HINT
 };
 
-#define GSTE_SLIDESHOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSTE_TYPE_SLIDESHOW, GSTESlideshowPrivate))
-
 static GObjectClass *parent_class = NULL;
 
-G_DEFINE_TYPE (GSTESlideshow, gste_slideshow, GS_TYPE_THEME_ENGINE)
+G_DEFINE_TYPE_WITH_PRIVATE (GSTESlideshow, gste_slideshow, GS_TYPE_THEME_ENGINE)
 
 #define N_FADE_TICKS 10
 #define MINIMUM_FPS 3.0
@@ -936,8 +934,6 @@ gste_slideshow_class_init (GSTESlideshowClass *klass)
 	widget_class->draw = gste_slideshow_real_draw;
 	widget_class->configure_event = gste_slideshow_real_configure;
 
-	g_type_class_add_private (klass, sizeof (GSTESlideshowPrivate));
-
 	g_object_class_install_property (object_class,
 	                                 PROP_IMAGES_LOCATION,
 	                                 g_param_spec_string ("images-location",
@@ -987,7 +983,7 @@ set_visual (GtkWidget *widget)
 static void
 gste_slideshow_init (GSTESlideshow *show)
 {
-	show->priv = GSTE_SLIDESHOW_GET_PRIVATE (show);
+	show->priv = gste_slideshow_get_instance_private (show);
 
 	show->priv->images_location = g_strdup (DEFAULT_IMAGES_LOCATION);
 
diff --git a/src/gs-fade.c b/src/gs-fade.c
index 184f3bc..574c7fa 100644
--- a/src/gs-fade.c
+++ b/src/gs-fade.c
@@ -60,8 +60,6 @@ static void     gs_fade_class_init (GSFadeClass *klass);
 static void     gs_fade_init       (GSFade      *fade);
 static void     gs_fade_finalize   (GObject        *object);
 
-#define GS_FADE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_FADE, GSFadePrivate))
-
 struct GSGammaInfo
 {
 	int              size;
@@ -121,7 +119,7 @@ enum
 
 static guint         signals [LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE (GSFade, gs_fade, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GSFade, gs_fade, G_TYPE_OBJECT)
 
 static gpointer fade_object = NULL;
 
@@ -890,14 +888,12 @@ gs_fade_class_init (GSFadeClass *klass)
 	                  g_cclosure_marshal_VOID__VOID,
 	                  G_TYPE_NONE,
 	                  0, G_TYPE_NONE);
-
-	g_type_class_add_private (klass, sizeof (GSFadePrivate));
 }
 
 static void
 gs_fade_init (GSFade *fade)
 {
-	fade->priv = GS_FADE_GET_PRIVATE (fade);
+	fade->priv = gs_fade_get_instance_private (fade);
 
 	fade->priv->timeout = 1000;
 	fade->priv->current_alpha = 1.0;
diff --git a/src/gs-grab-x11.c b/src/gs-grab-x11.c
index 5c7b77b..c4d08c4 100644
--- a/src/gs-grab-x11.c
+++ b/src/gs-grab-x11.c
@@ -41,10 +41,6 @@ static void     gs_grab_class_init (GSGrabClass *klass);
 static void     gs_grab_init       (GSGrab      *grab);
 static void     gs_grab_finalize   (GObject     *object);
 
-#define GS_GRAB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_GRAB, GSGrabPrivate))
-
-G_DEFINE_TYPE (GSGrab, gs_grab, G_TYPE_OBJECT)
-
 static gpointer grab_object = NULL;
 
 struct GSGrabPrivate
@@ -57,6 +53,8 @@ struct GSGrabPrivate
 	GtkWidget *invisible;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (GSGrab, gs_grab, G_TYPE_OBJECT)
+
 static const char *
 grab_string (int status)
 {
@@ -474,14 +472,12 @@ gs_grab_class_init (GSGrabClass *klass)
 	GObjectClass   *object_class = G_OBJECT_CLASS (klass);
 
 	object_class->finalize = gs_grab_finalize;
-
-	g_type_class_add_private (klass, sizeof (GSGrabPrivate));
 }
 
 static void
 gs_grab_init (GSGrab *grab)
 {
-	grab->priv = GS_GRAB_GET_PRIVATE (grab);
+	grab->priv = gs_grab_get_instance_private (grab);
 
 	grab->priv->no_pointer_grab = FALSE;
 	grab->priv->hide_cursor = FALSE;
diff --git a/src/gs-job.c b/src/gs-job.c
index e0d4d3e..c15f6bd 100644
--- a/src/gs-job.c
+++ b/src/gs-job.c
@@ -48,8 +48,6 @@ static void gs_job_class_init (GSJobClass *klass);
 static void gs_job_init       (GSJob      *job);
 static void gs_job_finalize   (GObject    *object);
 
-#define GS_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_JOB, GSJobPrivate))
-
 typedef enum
 {
     GS_JOB_INVALID,
@@ -70,7 +68,7 @@ struct GSJobPrivate
 	char           *command;
 };
 
-G_DEFINE_TYPE (GSJob, gs_job, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GSJob, gs_job, G_TYPE_OBJECT)
 
 static char *
 widget_get_id_string (GtkWidget *widget)
@@ -90,14 +88,12 @@ gs_job_class_init (GSJobClass *klass)
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
 	object_class->finalize  = gs_job_finalize;
-
-	g_type_class_add_private (klass, sizeof (GSJobPrivate));
 }
 
 static void
 gs_job_init (GSJob *job)
 {
-	job->priv = GS_JOB_GET_PRIVATE (job);
+	job->priv = gs_job_get_instance_private (job);
 }
 
 /* adapted from gspawn.c */
diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
index a8c2a7c..78ee369 100644
--- a/src/gs-listener-dbus.c
+++ b/src/gs-listener-dbus.c
@@ -78,8 +78,6 @@ static DBusHandlerResult gs_listener_message_handler    (DBusConnection  *connec
 
 #define TYPE_MISMATCH_ERROR GS_LISTENER_INTERFACE ".TypeMismatch"
 
-#define GS_LISTENER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_LISTENER, GSListenerPrivate))
-
 struct GSListenerPrivate
 {
 	DBusConnection *connection;
@@ -150,7 +148,7 @@ gs_listener_vtable = { &gs_listener_unregister_handler,
 
 static guint         signals [LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE (GSListener, gs_listener, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GSListener, gs_listener, G_TYPE_OBJECT)
 
 GQuark
 gs_listener_error_quark (void)
@@ -2138,8 +2136,6 @@ gs_listener_class_init (GSListenerClass *klass)
 	                                         NULL,
 	                                         TRUE,
 	                                         G_PARAM_READWRITE));
-
-	g_type_class_add_private (klass, sizeof (GSListenerPrivate));
 }
 
 
@@ -2409,7 +2405,7 @@ init_session_id (GSListener *listener)
 static void
 gs_listener_init (GSListener *listener)
 {
-	listener->priv = GS_LISTENER_GET_PRIVATE (listener);
+	listener->priv = gs_listener_get_instance_private (listener);
 
 #ifdef WITH_SYSTEMD
 	/* check if logind is running */
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index 7b25da0..2dcac57 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -68,9 +68,7 @@ enum
 static void gs_lock_plug_finalize   (GObject         *object);
 static void redraw_background       (GSLockPlug      *plug);
 
-#define GS_LOCK_PLUG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_LOCK_PLUG, GSLockPlugPrivate))
-
-	struct GSLockPlugPrivate
+struct GSLockPlugPrivate
 {
 	GtkWidget   *vbox;
 	GtkWidget   *auth_action_area;
@@ -139,7 +137,7 @@ enum
 
 static guint lock_plug_signals [LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (GSLockPlug, gs_lock_plug, GTK_TYPE_PLUG)
+G_DEFINE_TYPE_WITH_PRIVATE (GSLockPlug, gs_lock_plug, GTK_TYPE_PLUG)
 
 static void
 gs_lock_plug_style_set (GtkWidget *widget,
@@ -1285,8 +1283,6 @@ gs_lock_plug_class_init (GSLockPlugClass *klass)
 
 	klass->close = gs_lock_plug_close;
 
-	g_type_class_add_private (klass, sizeof (GSLockPlugPrivate));
-
 	lock_plug_signals [RESPONSE] = g_signal_new ("response",
 	                               G_OBJECT_CLASS_TYPE (klass),
 	                               G_SIGNAL_RUN_LAST,
@@ -2065,7 +2061,7 @@ gs_lock_plug_init (GSLockPlug *plug)
 {
 	gs_profile_start (NULL);
 
-	plug->priv = GS_LOCK_PLUG_GET_PRIVATE (plug);
+	plug->priv = gs_lock_plug_get_instance_private (plug);
 
 	clear_clipboards (plug);
 
diff --git a/src/gs-manager.c b/src/gs-manager.c
index 8b59c05..13a64f7 100644
--- a/src/gs-manager.c
+++ b/src/gs-manager.c
@@ -45,8 +45,6 @@ static void gs_manager_class_init (GSManagerClass *klass);
 static void gs_manager_init       (GSManager      *manager);
 static void gs_manager_finalize   (GObject        *object);
 
-#define GS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_MANAGER, GSManagerPrivate))
-
 struct GSManagerPrivate
 {
 	GSList      *windows;
@@ -120,7 +118,7 @@ enum
 
 static guint         signals [LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE (GSManager, gs_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GSManager, gs_manager, G_TYPE_OBJECT)
 
 static void
 manager_add_job_for_window (GSManager *manager,
@@ -1027,8 +1025,6 @@ gs_manager_class_init (GSManagerClass *klass)
 	                                         NULL,
 	                                         TRUE,
 	                                         G_PARAM_READWRITE));
-
-	g_type_class_add_private (klass, sizeof (GSManagerPrivate));
 }
 
 static void
@@ -1041,7 +1037,7 @@ on_bg_changed (XfceBG   *bg,
 static void
 gs_manager_init (GSManager *manager)
 {
-	manager->priv = GS_MANAGER_GET_PRIVATE (manager);
+	manager->priv = gs_manager_get_instance_private (manager);
 
 	manager->priv->fade = gs_fade_new ();
 	manager->priv->grab = gs_grab_new ();
diff --git a/src/gs-monitor.c b/src/gs-monitor.c
index f3176dc..ca5fa81 100644
--- a/src/gs-monitor.c
+++ b/src/gs-monitor.c
@@ -47,9 +47,6 @@ static void gs_monitor_class_init(GSMonitorClass* klass);
 static void gs_monitor_init(GSMonitor* monitor);
 static void gs_monitor_finalize(GObject* object);
 
-#define GS_MONITOR_GET_PRIVATE(o) \
-	(G_TYPE_INSTANCE_GET_PRIVATE((o), GS_TYPE_MONITOR, GSMonitorPrivate))
-
 struct GSMonitorPrivate {
 	GSWatcher* watcher;
 	GSListener* listener;
@@ -62,15 +59,13 @@ struct GSMonitorPrivate {
 
 #define FADE_TIMEOUT 10000
 
-G_DEFINE_TYPE(GSMonitor, gs_monitor, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE(GSMonitor, gs_monitor, G_TYPE_OBJECT)
 
 static void gs_monitor_class_init(GSMonitorClass* klass)
 {
 	GObjectClass* object_class = G_OBJECT_CLASS(klass);
 
 	object_class->finalize = gs_monitor_finalize;
-
-	g_type_class_add_private(klass, sizeof(GSMonitorPrivate));
 }
 
 static void manager_activated_cb(GSManager* manager, GSMonitor* monitor)
@@ -408,7 +403,7 @@ static void connect_prefs_signals(GSMonitor* monitor)
 static void gs_monitor_init(GSMonitor* monitor)
 {
 
-	monitor->priv = GS_MONITOR_GET_PRIVATE(monitor);
+	monitor->priv = gs_monitor_get_instance_private (monitor);
 
 	monitor->priv->prefs = gs_prefs_new();
 	connect_prefs_signals(monitor);
diff --git a/src/gs-prefs.c b/src/gs-prefs.c
index dd7fc73..d3db9cd 100644
--- a/src/gs-prefs.c
+++ b/src/gs-prefs.c
@@ -36,8 +36,6 @@ static void gs_prefs_class_init (GSPrefsClass *klass);
 static void gs_prefs_init       (GSPrefs      *prefs);
 static void gs_prefs_finalize   (GObject      *object);
 
-#define GS_PREFS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_PREFS, GSPrefsPrivate))
-
 struct GSPrefsPrivate
 {
 	XfconfChannel *channel;
@@ -56,7 +54,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,
@@ -106,9 +104,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
@@ -476,7 +471,7 @@ key_changed_cb (XfconfChannel *channel,
 static void
 gs_prefs_init (GSPrefs *prefs)
 {
-	prefs->priv = GS_PREFS_GET_PRIVATE (prefs);
+	prefs->priv = gs_prefs_get_instance_private (prefs);
 
 	prefs->priv->channel = xfconf_channel_get (SETTINGS_XFCONF_CHANNEL);
 	g_signal_connect (prefs->priv->channel,
diff --git a/src/gs-theme-manager.c b/src/gs-theme-manager.c
index af025f3..050ea75 100644
--- a/src/gs-theme-manager.c
+++ b/src/gs-theme-manager.c
@@ -40,8 +40,6 @@ static void     gs_theme_manager_class_init (GSThemeManagerClass *klass);
 static void     gs_theme_manager_init       (GSThemeManager      *theme_manager);
 static void     gs_theme_manager_finalize   (GObject             *object);
 
-#define GS_THEME_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_THEME_MANAGER, GSThemeManagerPrivate))
-
 struct _GSThemeInfo
 {
 	char  *name;
@@ -55,7 +53,7 @@ struct GSThemeManagerPrivate
 	XfceMenuTree *menu_tree;
 };
 
-G_DEFINE_TYPE (GSThemeManager, gs_theme_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GSThemeManager, gs_theme_manager, G_TYPE_OBJECT)
 
 static gpointer theme_manager_object = NULL;
 
@@ -389,8 +387,6 @@ gs_theme_manager_class_init (GSThemeManagerClass *klass)
 	GObjectClass   *object_class = G_OBJECT_CLASS (klass);
 
 	object_class->finalize = gs_theme_manager_finalize;
-
-	g_type_class_add_private (klass, sizeof (GSThemeManagerPrivate));
 }
 
 static XfceMenuTree *
@@ -410,7 +406,7 @@ get_themes_tree (void)
 static void
 gs_theme_manager_init (GSThemeManager *theme_manager)
 {
-	theme_manager->priv = GS_THEME_MANAGER_GET_PRIVATE (theme_manager);
+	theme_manager->priv = gs_theme_manager_get_instance_private (theme_manager);
 
 	theme_manager->priv->menu_tree = get_themes_tree ();
 }
diff --git a/src/gs-watcher-x11.c b/src/gs-watcher-x11.c
index 3d63863..eac7859 100644
--- a/src/gs-watcher-x11.c
+++ b/src/gs-watcher-x11.c
@@ -43,8 +43,6 @@ static void     gs_watcher_finalize   (GObject        *object);
 
 static gboolean watchdog_timer        (GSWatcher      *watcher);
 
-#define GS_WATCHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_WATCHER, GSWatcherPrivate))
-
 struct GSWatcherPrivate
 {
 	/* settings */
@@ -78,7 +76,7 @@ enum
 
 static guint signals [LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE (GSWatcher, gs_watcher, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GSWatcher, gs_watcher, G_TYPE_OBJECT)
 
 static void
 remove_watchdog_timer (GSWatcher *watcher)
@@ -188,8 +186,6 @@ gs_watcher_class_init (GSWatcherClass *klass)
 	                  gs_marshal_BOOLEAN__BOOLEAN,
 	                  G_TYPE_BOOLEAN,
 	                  1, G_TYPE_BOOLEAN);
-
-	g_type_class_add_private (klass, sizeof (GSWatcherPrivate));
 }
 
 static gboolean
@@ -535,7 +531,7 @@ done:
 static void
 gs_watcher_init (GSWatcher *watcher)
 {
-	watcher->priv = GS_WATCHER_GET_PRIVATE (watcher);
+	watcher->priv = gs_watcher_get_instance_private (watcher);
 
 	watcher->priv->enabled = TRUE;
 	watcher->priv->active = FALSE;
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
index e273b20..bfcfa36 100644
--- a/src/gs-window-x11.c
+++ b/src/gs-window-x11.c
@@ -58,8 +58,6 @@ enum
 #define MAX_QUEUED_EVENTS 16
 #define INFO_BAR_SECONDS 30
 
-#define GS_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_WINDOW, GSWindowPrivate))
-
 struct GSWindowPrivate
 {
 	GdkMonitor *monitor;
@@ -142,7 +140,7 @@ enum
 
 static guint           signals [LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE (GSWindow, gs_window, GTK_TYPE_WINDOW)
+G_DEFINE_TYPE_WITH_PRIVATE (GSWindow, gs_window, GTK_TYPE_WINDOW)
 
 static void
 set_invisible_cursor (GdkWindow *window,
@@ -2351,8 +2349,6 @@ gs_window_class_init (GSWindowClass *klass)
 	widget_class->grab_broken_event   = gs_window_real_grab_broken;
 	widget_class->visibility_notify_event = gs_window_real_visibility_notify_event;
 
-	g_type_class_add_private (klass, sizeof (GSWindowPrivate));
-
 	signals [ACTIVITY] =
 	    g_signal_new ("activity",
 	                  G_TYPE_FROM_CLASS (object_class),
@@ -2470,7 +2466,7 @@ on_drawing_area_draw (GtkWidget *widget,
 static void
 gs_window_init (GSWindow *window)
 {
-	window->priv = GS_WINDOW_GET_PRIVATE (window);
+	window->priv = gs_window_get_instance_private (window);
 
 	window->priv->geometry.x      = -1;
 	window->priv->geometry.y      = -1;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list