diff options
| author | Wu Xiaotian <[email protected]> | 2019-01-26 21:54:36 +0800 |
|---|---|---|
| committer | lukefromdc <[email protected]> | 2019-01-29 20:18:39 +0000 |
| commit | b7dffb4086d7230c1b210bfc06a068a24ef21e5c (patch) | |
| tree | 106e6184f387c3f02e521366cb89cadfc5d51af7 | |
| parent | 627a1d931e3417630a5df78bb87b0d7873e43342 (diff) | |
| download | mate-desktop-b7dffb4086d7230c1b210bfc06a068a24ef21e5c.tar.bz2 mate-desktop-b7dffb4086d7230c1b210bfc06a068a24ef21e5c.tar.xz | |
[mate-rr] Avoid deprecated g_type_class_add_private
| -rw-r--r-- | libmate-desktop/mate-rr-config.c | 6 | ||||
| -rw-r--r-- | libmate-desktop/mate-rr-labeler.c | 6 | ||||
| -rw-r--r-- | libmate-desktop/mate-rr-output-info.c | 6 | ||||
| -rw-r--r-- | libmate-desktop/mate-rr.c | 6 |
4 files changed, 9 insertions, 15 deletions
diff --git a/libmate-desktop/mate-rr-config.c b/libmate-desktop/mate-rr-config.c index 0f96a9b..6048db0 100644 --- 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 @@ out: 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 index a1786a5..346eb71 100644 --- 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 index 02ea16a..9761e9c 100644 --- 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 index c5148ff..04ffd0d 100644 --- 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; |