[tali] Use G_DEFINE_TYPE_WITH_PRIVATE()

[Mart Raudsepp <mraudsepp src gnome org>]

commit 98fbd74d91045ac7a9c481e2062eeca9d9913664
Author: Mart Raudsepp <leio gentoo org>
Date:   Sat Mar 28 20:24:40 2020 +0200

    Use G_DEFINE_TYPE_WITH_PRIVATE()
    
    instead of deprecated g_type_class_add_private() API.

 src/games-frame.c | 41 ++++++++++++++++++++---------------------
 src/games-frame.h |  2 --
 2 files changed, 20 insertions(+), 23 deletions(-)
---
diff --git a/src/games-frame.c b/src/games-frame.c
index fb6f9b4..e198ccf 100644
--- a/src/games-frame.c
+++ b/src/games-frame.c
@@ -26,45 +26,44 @@ enum {
   PROP_LABEL
 };
 
-G_DEFINE_TYPE (GamesFrame, games_frame, GTK_TYPE_BOX);
-
 struct GamesFramePrivate {
   GtkWidget *label;
   GtkWidget *alignment;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (GamesFrame, games_frame, GTK_TYPE_BOX);
+
 static void
 games_frame_init (GamesFrame * frame)
 {
   GtkBox *box = GTK_BOX (frame);
   PangoAttrList *attr_list;
   PangoAttribute *attr;
-
-  frame->priv = G_TYPE_INSTANCE_GET_PRIVATE (frame, GAMES_TYPE_FRAME, GamesFramePrivate);
+  GamesFramePrivate *priv = games_frame_get_instance_private (frame);
 
   gtk_box_set_spacing (box, 6);
   gtk_box_set_homogeneous (box, FALSE);
   gtk_orientable_set_orientation (GTK_ORIENTABLE (frame), GTK_ORIENTATION_VERTICAL);
 
-  frame->priv->label = gtk_label_new (NULL);
-  gtk_misc_set_alignment (GTK_MISC (frame->priv->label), 0.0, 0.5);
+  priv->label = gtk_label_new (NULL);
+  gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.5);
 
   attr_list = pango_attr_list_new ();
   attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
   attr->start_index = 0;
   attr->end_index = -1;
   pango_attr_list_insert (attr_list, attr);
-  gtk_label_set_attributes (GTK_LABEL (frame->priv->label), attr_list);
+  gtk_label_set_attributes (GTK_LABEL (priv->label), attr_list);
   pango_attr_list_unref (attr_list);
 
-  frame->priv->alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (frame->priv->alignment), 0, 0, 12, 0);
+  priv->alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+  gtk_alignment_set_padding (GTK_ALIGNMENT (priv->alignment), 0, 0, 12, 0);
 
-  gtk_box_pack_start (box, frame->priv->label, FALSE, FALSE, 0);
-  gtk_box_pack_start (box, frame->priv->alignment, TRUE, TRUE, 0);
+  gtk_box_pack_start (box, priv->label, FALSE, FALSE, 0);
+  gtk_box_pack_start (box, priv->alignment, TRUE, TRUE, 0);
 
-  gtk_widget_set_no_show_all (frame->priv->label, TRUE);
-  gtk_widget_show (frame->priv->alignment);
+  gtk_widget_set_no_show_all (priv->label, TRUE);
+  gtk_widget_show (priv->alignment);
 }
 
 static void
@@ -87,11 +86,12 @@ games_frame_add (GtkContainer *container,
                  GtkWidget *child)
 {
   GamesFrame *frame = GAMES_FRAME (container);
+  GamesFramePrivate *priv = games_frame_get_instance_private (frame);
 
-  gtk_container_add (GTK_CONTAINER (frame->priv->alignment), child);
+  gtk_container_add (GTK_CONTAINER (priv->alignment), child);
 
-  add_atk_relation (frame->priv->label, child, ATK_RELATION_LABEL_FOR);
-  add_atk_relation (child, frame->priv->label, ATK_RELATION_LABELLED_BY);
+  add_atk_relation (priv->label, child, ATK_RELATION_LABEL_FOR);
+  add_atk_relation (child, priv->label, ATK_RELATION_LABELLED_BY);
 }
 
 static void
@@ -122,8 +122,6 @@ games_frame_class_init (GamesFrameClass * klass)
   object_class->set_property = games_frame_set_property;
   container_class->add = games_frame_add;
 
-  g_type_class_add_private (object_class, sizeof (GamesFramePrivate));
-
   g_object_class_install_property
     (object_class,
      PROP_LABEL,
@@ -160,15 +158,16 @@ void
 games_frame_set_label (GamesFrame *frame,
                        const char *label)
 {
+  GamesFramePrivate *priv = games_frame_get_instance_private (frame);
   g_return_if_fail (GAMES_IS_FRAME (frame));
 
   if (label) {
-    gtk_label_set_text (GTK_LABEL (frame->priv->label), label);
+    gtk_label_set_text (GTK_LABEL (priv->label), label);
   } else {
-    gtk_label_set_text (GTK_LABEL (frame->priv->label), "");
+    gtk_label_set_text (GTK_LABEL (priv->label), "");
   }
 
-  g_object_set (frame->priv->label, "visible", label && label[0], NULL);
+  g_object_set (priv->label, "visible", label && label[0], NULL);
 
   g_object_notify (G_OBJECT (frame), "label");
 }
diff --git a/src/games-frame.h b/src/games-frame.h
index 748b0b6..ef2bdf3 100644
--- a/src/games-frame.h
+++ b/src/games-frame.h
@@ -36,8 +36,6 @@ typedef struct GamesFramePrivate GamesFramePrivate;
 
 typedef struct {
   GtkBox parent_instance;
-  /*< private >*/
-  GamesFramePrivate *priv;
 } GamesFrame;
 
 typedef struct {