[mate-rr] Avoid deprecated g_type_class_add_private

yetist · lukefromdc · commit b7dffb4086d7 · 2019-01-29T20:18:39.000Z
diff --git a/libmate-desktop/mate-rr-config.c b/libmate-desktop/mate-rr-config.c
@@ -91,7 +91,7 @@ enum {
   PROP_LAST
 };
 
-G_DEFINE_TYPE (MateRRConfig, mate_rr_config, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (MateRRConfig, mate_rr_config, G_TYPE_OBJECT)
 
 typedef struct Parser Parser;
 
@@ -449,7 +449,7 @@ configurations_read_from_file (const gchar *filename, GError **error)
 static void
 mate_rr_config_init (MateRRConfig *self)
 {
-    self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, MATE_TYPE_RR_CONFIG, MateRRConfigPrivate);
+    self->priv = mate_rr_config_get_instance_private (self);
 
     self->priv->clone = FALSE;
     self->priv->screen = NULL;
@@ -722,8 +722,6 @@ mate_rr_config_class_init (MateRRConfigClass *klass)
 {
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (MateRROutputInfoPrivate));
-
     gobject_class->set_property = mate_rr_config_set_property;
     gobject_class->finalize = mate_rr_config_finalize;
 
diff --git a/libmate-desktop/mate-rr-labeler.c b/libmate-desktop/mate-rr-labeler.c
@@ -57,7 +57,7 @@ enum {
 	PROP_LAST
 };
 
-G_DEFINE_TYPE (MateRRLabeler, mate_rr_labeler, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (MateRRLabeler, mate_rr_labeler, G_TYPE_OBJECT);
 
 static void mate_rr_labeler_finalize (GObject *object);
 static void create_label_windows (MateRRLabeler *labeler);
@@ -186,7 +186,7 @@ mate_rr_labeler_init (MateRRLabeler *labeler)
 {
 	GdkWindow *gdkwindow;
 
-	labeler->priv = G_TYPE_INSTANCE_GET_PRIVATE (labeler, MATE_TYPE_RR_LABELER, MateRRLabelerPrivate);
+	labeler->priv = mate_rr_labeler_get_instance_private (labeler);
 
 	labeler->priv->workarea_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
 						    "_NET_WORKAREA",
@@ -228,8 +228,6 @@ mate_rr_labeler_class_init (MateRRLabelerClass *klass)
 {
 	GObjectClass *object_class;
 
-	g_type_class_add_private (klass, sizeof (MateRRLabelerPrivate));
-
 	object_class = (GObjectClass *) klass;
 
 	object_class->set_property = mate_rr_labeler_set_property;
diff --git a/libmate-desktop/mate-rr-output-info.c b/libmate-desktop/mate-rr-output-info.c
@@ -30,12 +30,12 @@
 #include "edid.h"
 #include "mate-rr-private.h"
 
-G_DEFINE_TYPE (MateRROutputInfo, mate_rr_output_info, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (MateRROutputInfo, mate_rr_output_info, G_TYPE_OBJECT)
 
 static void
 mate_rr_output_info_init (MateRROutputInfo *self)
 {
-    self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, MATE_TYPE_RR_OUTPUT_INFO, MateRROutputInfoPrivate);
+    self->priv = mate_rr_output_info_get_instance_private (self);
 
     self->priv->name = NULL;
     self->priv->on = FALSE;
@@ -58,8 +58,6 @@ mate_rr_output_info_class_init (MateRROutputInfoClass *klass)
 {
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (MateRROutputInfoPrivate));
-
     gobject_class->finalize = mate_rr_output_info_finalize;
 }
 
diff --git a/libmate-desktop/mate-rr.c b/libmate-desktop/mate-rr.c
@@ -167,7 +167,8 @@ static void mate_rr_screen_get_property (GObject*, guint, GValue*, GParamSpec*);
 static gboolean mate_rr_screen_initable_init (GInitable*, GCancellable*, GError**);
 static void mate_rr_screen_initable_iface_init (GInitableIface *iface);
 G_DEFINE_TYPE_WITH_CODE (MateRRScreen, mate_rr_screen, G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, mate_rr_screen_initable_iface_init))
+                         G_ADD_PRIVATE(MateRRScreen)
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, mate_rr_screen_initable_iface_init))
 
 G_DEFINE_BOXED_TYPE (MateRRCrtc, mate_rr_crtc, crtc_copy, crtc_free)
 G_DEFINE_BOXED_TYPE (MateRROutput, mate_rr_output, output_copy, output_free)
@@ -774,7 +775,6 @@ void
 mate_rr_screen_class_init (MateRRScreenClass *klass)
 {
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-    g_type_class_add_private (klass, sizeof (MateRRScreenPrivate));
 
     gobject_class->set_property = mate_rr_screen_set_property;
     gobject_class->get_property = mate_rr_screen_get_property;
@@ -805,7 +805,7 @@ mate_rr_screen_class_init (MateRRScreenClass *klass)
 void
 mate_rr_screen_init (MateRRScreen *self)
 {
-    MateRRScreenPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, MATE_TYPE_RR_SCREEN, MateRRScreenPrivate);
+    MateRRScreenPrivate *priv = mate_rr_screen_get_instance_private (self);
     self->priv = priv;
 
     priv->gdk_screen = NULL;

Original file line number	Diff line number	Diff line change
`@@ -30,12 +30,12 @@`
`30`	`30`	`#include "edid.h"`
`31`	`31`	`#include "mate-rr-private.h"`
`32`	`32`
`33`		`-G_DEFINE_TYPE (MateRROutputInfo, mate_rr_output_info, G_TYPE_OBJECT)`
	`33`	`+G_DEFINE_TYPE_WITH_PRIVATE (MateRROutputInfo, mate_rr_output_info, G_TYPE_OBJECT)`
`34`	`34`
`35`	`35`	`static void`
`36`	`36`	`mate_rr_output_info_init (MateRROutputInfo *self)`
`37`	`37`	`{`
`38`		`- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, MATE_TYPE_RR_OUTPUT_INFO, MateRROutputInfoPrivate);`
	`38`	`+ self->priv = mate_rr_output_info_get_instance_private (self);`
`39`	`39`
`40`	`40`	`self->priv->name = NULL;`
`41`	`41`	`self->priv->on = FALSE;`
`@@ -58,8 +58,6 @@ mate_rr_output_info_class_init (MateRROutputInfoClass *klass)`
`58`	`58`	`{`
`59`	`59`	`GObjectClass *gobject_class = G_OBJECT_CLASS (klass);`
`60`	`60`
`61`		`- g_type_class_add_private (klass, sizeof (MateRROutputInfoPrivate));`
`62`		`-`
`63`	`61`	`gobject_class->finalize = mate_rr_output_info_finalize;`
`64`	`62`	`}`
`65`	`63`