[totem/gkarsay/totem-master: 1/6] backend: Replace deprecated g_type_class_add_private()

[Bastien Nocera <hadess src gnome org>]

commit 4dfb008af99f3951fb9b5e2adf5ae2903958fadb
Author: Gabor Karsay <gabor karsay gmx at>
Date:   Thu Sep 26 11:31:57 2019 +0200

    backend: Replace deprecated g_type_class_add_private()
    
    g_type_class_add_private has been deprecated since GObject 2.58.

 src/backend/bacon-time-label.c           |  7 ++-----
 src/backend/bacon-video-controls-actor.c |  8 ++------
 src/backend/bacon-video-spinner-actor.c  |  7 ++-----
 src/backend/bacon-video-widget.c         | 13 ++++++-------
 src/backend/totem-aspect-frame.c         | 13 +++----------
 5 files changed, 15 insertions(+), 33 deletions(-)
---
diff --git a/src/backend/bacon-time-label.c b/src/backend/bacon-time-label.c
index 20b1e8da0..60b4bc441 100644
--- a/src/backend/bacon-time-label.c
+++ b/src/backend/bacon-time-label.c
@@ -31,8 +31,7 @@ struct _BaconTimeLabelPrivate {
        gboolean remaining;
 };
 
-G_DEFINE_TYPE (BaconTimeLabel, bacon_time_label, GTK_TYPE_LABEL)
-#define BACON_TIME_LABEL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), BACON_TYPE_TIME_LABEL, 
BaconTimeLabelPrivate))
+G_DEFINE_TYPE_WITH_PRIVATE (BaconTimeLabel, bacon_time_label, GTK_TYPE_LABEL)
 
 enum {
        PROP_0,
@@ -43,7 +42,7 @@ static void
 bacon_time_label_init (BaconTimeLabel *label)
 {
        char *time_string;
-       label->priv = G_TYPE_INSTANCE_GET_PRIVATE (label, BACON_TYPE_TIME_LABEL, BaconTimeLabelPrivate);
+       label->priv = bacon_time_label_get_instance_private (label);
 
        time_string = totem_time_to_string (0, FALSE, FALSE);
        gtk_label_set_text (GTK_LABEL (label), time_string);
@@ -81,8 +80,6 @@ bacon_time_label_class_init (BaconTimeLabelClass *klass)
 {
        GObjectClass *object_class;
 
-       g_type_class_add_private (klass, sizeof (BaconTimeLabelPrivate));
-
        object_class = (GObjectClass *) klass;
        object_class->set_property = bacon_time_label_set_property;
 
diff --git a/src/backend/bacon-video-controls-actor.c b/src/backend/bacon-video-controls-actor.c
index a8e2f8936..53855e32f 100644
--- a/src/backend/bacon-video-controls-actor.c
+++ b/src/backend/bacon-video-controls-actor.c
@@ -24,8 +24,6 @@
 #include "bacon-video-controls-actor.h"
 #include "bacon-time-label.h"
 
-#define BACON_VIDEO_CONTROLS_ACTOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), 
BACON_TYPE_VIDEO_CONTROLS_ACTOR, BaconVideoControlsActorPrivate))
-
 struct BaconVideoControlsActorPrivate
 {
        GtkBuilder *builder;
@@ -33,7 +31,7 @@ struct BaconVideoControlsActorPrivate
        GObject *bvw;
 };
 
-G_DEFINE_TYPE (BaconVideoControlsActor, bacon_video_controls_actor, GTK_CLUTTER_TYPE_ACTOR);
+G_DEFINE_TYPE_WITH_PRIVATE (BaconVideoControlsActor, bacon_video_controls_actor, GTK_CLUTTER_TYPE_ACTOR);
 
 static void
 bacon_video_controls_actor_finalize (GObject *object)
@@ -72,8 +70,6 @@ bacon_video_controls_actor_class_init (BaconVideoControlsActorClass *klass)
 
         gobject_class->finalize = bacon_video_controls_actor_finalize;
         gobject_class->constructed = bacon_video_controls_actor_constructed;
-
-        g_type_class_add_private (klass, sizeof (BaconVideoControlsActorPrivate));
 }
 
 static void
@@ -105,7 +101,7 @@ bacon_video_controls_actor_init (BaconVideoControlsActor *controls)
 {
        const char *objects[] = { "toolbar", NULL };
 
-       controls->priv = BACON_VIDEO_CONTROLS_ACTOR_GET_PRIVATE (G_OBJECT (controls));
+       controls->priv = bacon_video_controls_actor_get_instance_private (controls);
 
        g_type_class_ref (BACON_TYPE_TIME_LABEL);
 
diff --git a/src/backend/bacon-video-spinner-actor.c b/src/backend/bacon-video-spinner-actor.c
index 829c15cde..ae38317a2 100644
--- a/src/backend/bacon-video-spinner-actor.c
+++ b/src/backend/bacon-video-spinner-actor.c
@@ -24,14 +24,13 @@
 #include "bacon-video-spinner-actor.h"
 #include "clock.h"
 
-#define BACON_VIDEO_SPINNER_ACTOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), 
BACON_TYPE_VIDEO_SPINNER_ACTOR, BaconVideoSpinnerActorPrivate))
 
 struct BaconVideoSpinnerActorPrivate
 {
        ClutterActor     *clock;
 };
 
-G_DEFINE_TYPE (BaconVideoSpinnerActor, bacon_video_spinner_actor, CLUTTER_TYPE_ACTOR);
+G_DEFINE_TYPE_WITH_PRIVATE (BaconVideoSpinnerActor, bacon_video_spinner_actor, CLUTTER_TYPE_ACTOR);
 
 enum {
        PROP_0,
@@ -89,8 +88,6 @@ bacon_video_spinner_actor_class_init (BaconVideoSpinnerActorClass *klass)
                                                             "Percentage fill",
                                                             0.0, 100.0, 0.0,
                                                             G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-        g_type_class_add_private (klass, sizeof (BaconVideoSpinnerActorPrivate));
 }
 
 static void
@@ -100,7 +97,7 @@ bacon_video_spinner_actor_init (BaconVideoSpinnerActor *spinner)
        ClutterConstraint *constraint;
        ClutterColor *color;
 
-       spinner->priv = BACON_VIDEO_SPINNER_ACTOR_GET_PRIVATE (G_OBJECT (spinner));
+       spinner->priv = bacon_video_spinner_actor_get_instance_private (spinner);
        actor = CLUTTER_ACTOR (spinner);
 
        /* We'll set that colour on the layout, as the child doesn't
diff --git a/src/backend/bacon-video-widget.c b/src/backend/bacon-video-widget.c
index 45c4d0e66..ba2fdba74 100644
--- a/src/backend/bacon-video-widget.c
+++ b/src/backend/bacon-video-widget.c
@@ -112,10 +112,6 @@
 
 static void bacon_video_widget_initable_iface_init (GInitableIface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (BaconVideoWidget, bacon_video_widget, GTK_CLUTTER_TYPE_EMBED,
-                        G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
-                                               bacon_video_widget_initable_iface_init))
-
 /* Signals */
 enum
 {
@@ -284,6 +280,11 @@ struct BaconVideoWidgetPrivate
   float                        rate;
 };
 
+G_DEFINE_TYPE_WITH_CODE (BaconVideoWidget, bacon_video_widget, GTK_CLUTTER_TYPE_EMBED,
+                        G_ADD_PRIVATE (BaconVideoWidget)
+                        G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+                                               bacon_video_widget_initable_iface_init))
+
 static void bacon_video_widget_set_property (GObject * object,
                                              guint property_id,
                                              const GValue * value,
@@ -1077,8 +1078,6 @@ bacon_video_widget_class_init (BaconVideoWidgetClass * klass)
 
   parent_class = g_type_class_peek_parent (klass);
 
-  g_type_class_add_private (object_class, sizeof (BaconVideoWidgetPrivate));
-
   /* GtkWidget */
   widget_class->get_preferred_width = bacon_video_widget_get_preferred_width;
   widget_class->get_preferred_height = bacon_video_widget_get_preferred_height;
@@ -1501,7 +1500,7 @@ bacon_video_widget_init (BaconVideoWidget * bvw)
   g_type_class_ref (BVW_TYPE_DVD_EVENT);
   g_type_class_ref (BVW_TYPE_ROTATION);
 
-  bvw->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (bvw, BACON_TYPE_VIDEO_WIDGET, BaconVideoWidgetPrivate);
+  bvw->priv = priv = bacon_video_widget_get_instance_private (bvw);
 
   g_object_set (G_OBJECT (bvw), "use-layout-size", TRUE, NULL);
 
diff --git a/src/backend/totem-aspect-frame.c b/src/backend/totem-aspect-frame.c
index c352717e2..19d75ee31 100644
--- a/src/backend/totem-aspect-frame.c
+++ b/src/backend/totem-aspect-frame.c
@@ -26,13 +26,6 @@
 
 #include "totem-aspect-frame.h"
 
-G_DEFINE_TYPE (TotemAspectFrame, totem_aspect_frame, CLUTTER_TYPE_ACTOR)
-
-#define ASPECT_FRAME_PRIVATE(o)                         \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o),                    \
-                                TOTEM_TYPE_ASPECT_FRAME,   \
-                                TotemAspectFramePrivate))
-
 enum
 {
   PROP_0,
@@ -46,6 +39,8 @@ struct _TotemAspectFramePrivate
   gdouble rotation;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (TotemAspectFrame, totem_aspect_frame, CLUTTER_TYPE_ACTOR)
+
 
 static void
 totem_aspect_frame_get_property (GObject    *object,
@@ -345,8 +340,6 @@ totem_aspect_frame_class_init (TotemAspectFrameClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (TotemAspectFramePrivate));
-
   object_class->get_property = totem_aspect_frame_get_property;
   object_class->set_property = totem_aspect_frame_set_property;
   object_class->dispose = totem_aspect_frame_dispose;
@@ -370,7 +363,7 @@ totem_aspect_frame_class_init (TotemAspectFrameClass *klass)
 static void
 totem_aspect_frame_init (TotemAspectFrame *self)
 {
-  self->priv = ASPECT_FRAME_PRIVATE (self);
+  self->priv = totem_aspect_frame_get_instance_private (self);
   clutter_actor_set_pivot_point (CLUTTER_ACTOR (self), 0.5f, 0.5f);
 }