GNOME.org
 

[goobox] use G_ADD_PRIVATE instead of g_type_class_add_private

commit f07fe5c15327e130b6360da1830def1a295ca621
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Fri Dec 28 14:10:16 2018 +0100

    use G_ADD_PRIVATE instead of g_type_class_add_private
    
    requires glib 2.38

 meson.build                   |  2 +-
 src/gnome-desktop-thumbnail.c | 11 +++++------
 src/goo-application.c         | 13 ++++++-------
 src/goo-player-bar.c          | 13 ++++++-------
 src/goo-player-bar.h          |  4 ++--
 src/goo-player-info.c         | 31 ++++++++++++++-----------------
 src/goo-player-info.h         |  8 ++++----
 src/goo-player.c              |  9 +++------
 src/goo-window.c              |  7 +++----
 9 files changed, 44 insertions(+), 54 deletions(-)
---
diff --git a/meson.build b/meson.build
index 043bc5b..dda9a9e 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project('goobox', 'c',
   meson_version : '>=0.43'
 )
 
-glib_version = '>=2.36'
+glib_version = '>=2.38'
 gtk_version = '>=3.13.2'
 gstreamer_version = '>=1.0.0'
 musicbrainz_version = '>=5.0.0'
diff --git a/src/gnome-desktop-thumbnail.c b/src/gnome-desktop-thumbnail.c
index 6465250..d381a65 100644
--- a/src/gnome-desktop-thumbnail.c
+++ b/src/gnome-desktop-thumbnail.c
@@ -65,9 +65,10 @@ static const char *appname = "gnome-thumbnail-factory";
 static void gnome_desktop_thumbnail_factory_init          (GnomeDesktopThumbnailFactory      *factory);
 static void gnome_desktop_thumbnail_factory_class_init    (GnomeDesktopThumbnailFactoryClass *class);
 
-G_DEFINE_TYPE (GnomeDesktopThumbnailFactory,
-              gnome_desktop_thumbnail_factory,
-              G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_CODE (GnomeDesktopThumbnailFactory,
+                        gnome_desktop_thumbnail_factory,
+                        G_TYPE_OBJECT,
+                        G_ADD_PRIVATE (GnomeDesktopThumbnailFactory))
 #define parent_class gnome_desktop_thumbnail_factory_parent_class
 
 #define GNOME_DESKTOP_THUMBNAIL_FACTORY_GET_PRIVATE(object) \
@@ -733,7 +734,7 @@ gnome_desktop_thumbnail_factory_init (GnomeDesktopThumbnailFactory *factory)
 {
   GnomeDesktopThumbnailFactoryPrivate *priv;
 
-  factory->priv = GNOME_DESKTOP_THUMBNAIL_FACTORY_GET_PRIVATE (factory);
+  factory->priv = gnome_desktop_thumbnail_factory_get_instance_private (factory);
 
   priv = factory->priv;
 
@@ -769,8 +770,6 @@ gnome_desktop_thumbnail_factory_class_init (GnomeDesktopThumbnailFactoryClass *c
   gobject_class = G_OBJECT_CLASS (class);
 
   gobject_class->finalize = gnome_desktop_thumbnail_factory_finalize;
-
-  g_type_class_add_private (class, sizeof (GnomeDesktopThumbnailFactoryPrivate));
 }
 
 /**
diff --git a/src/goo-application.c b/src/goo-application.c
index 06a415f..5e342f5 100644
--- a/src/goo-application.c
+++ b/src/goo-application.c
@@ -85,14 +85,15 @@ static const GOptionEntry options[] = {
 /* -- GooApplication --  */
 
 
-G_DEFINE_TYPE (GooApplication, goo_application, GTK_TYPE_APPLICATION)
-
-
 struct _GooApplicationPrivate {
-        GSettings *settings;
+       GSettings *settings;
 };
 
 
+G_DEFINE_TYPE_WITH_CODE (GooApplication, goo_application, GTK_TYPE_APPLICATION,
+                        G_ADD_PRIVATE (GooApplication))
+
+
 static void
 goo_application_finalize (GObject *object)
 {
@@ -400,8 +401,6 @@ goo_application_class_init (GooApplicationClass *klass)
        GObjectClass      *object_class;
        GApplicationClass *application_class;
 
-       g_type_class_add_private (klass, sizeof (GooApplicationPrivate));
-
        object_class = G_OBJECT_CLASS (klass);
        object_class->finalize = goo_application_finalize;
 
@@ -415,7 +414,7 @@ goo_application_class_init (GooApplicationClass *klass)
 static void
 goo_application_init (GooApplication *self)
 {
-       self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GOO_TYPE_APPLICATION, GooApplicationPrivate);
+       self->priv = goo_application_get_instance_private (self);
        self->priv->settings = g_settings_new (GOOBOX_SCHEMA_PLAYLIST);
 }
 
diff --git a/src/goo-player-bar.c b/src/goo-player-bar.c
index 9776d43..e885d97 100644
--- a/src/goo-player-bar.c
+++ b/src/goo-player-bar.c
@@ -35,10 +35,7 @@
 #define UPDATE_TIMEOUT 50
 
 
-G_DEFINE_TYPE (GooPlayerBar, goo_player_bar, GTK_TYPE_BOX)
-
-
-struct _GooPlayerBarPrivateData {
+struct _GooPlayerBarPrivate {
        GooPlayer *player;
        GtkWidget *current_time_label;
        GtkWidget *remaining_time_label;
@@ -54,6 +51,10 @@ struct _GooPlayerBarPrivateData {
 };
 
 
+G_DEFINE_TYPE_WITH_CODE (GooPlayerBar, goo_player_bar, GTK_TYPE_BOX,
+                        G_ADD_PRIVATE (GooPlayerBar))
+
+
 enum {
        SKIP_TO,
         LAST_SIGNAL
@@ -184,7 +185,7 @@ time_scale_button_release_cb (GtkRange         *range,
 static void
 goo_player_bar_init (GooPlayerBar *self)
 {
-       self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GOO_TYPE_PLAYER_BAR, GooPlayerBarPrivateData);
+       self->priv = goo_player_bar_get_instance_private (self);
        self->priv->dragging = FALSE;
        self->priv->track_length = 0;
        self->priv->current_time = 0;
@@ -344,8 +345,6 @@ goo_player_bar_class_init (GooPlayerBarClass *class)
         GObjectClass   *gobject_class;
        GtkWidgetClass *widget_class;
 
-       g_type_class_add_private (class, sizeof (GooPlayerBarPrivateData));
-
        gobject_class = G_OBJECT_CLASS (class);
         gobject_class->finalize = goo_player_bar_finalize;
 
diff --git a/src/goo-player-bar.h b/src/goo-player-bar.h
index ca2ff6e..b4be078 100644
--- a/src/goo-player-bar.h
+++ b/src/goo-player-bar.h
@@ -34,12 +34,12 @@
 
 typedef struct _GooPlayerBar            GooPlayerBar;
 typedef struct _GooPlayerBarClass       GooPlayerBarClass;
-typedef struct _GooPlayerBarPrivateData GooPlayerBarPrivateData;
+typedef struct _GooPlayerBarPrivate     GooPlayerBarPrivate;
 
 struct _GooPlayerBar
 {
        GtkBox __parent;
-       GooPlayerBarPrivateData *priv;
+       GooPlayerBarPrivate *priv;
 };
 
 struct _GooPlayerBarClass
diff --git a/src/goo-player-info.c b/src/goo-player-info.c
index 588dde0..5a7fc54 100644
--- a/src/goo-player-info.c
+++ b/src/goo-player-info.c
@@ -42,10 +42,7 @@
 #define UPDATE_TIMEOUT 50
 
 
-G_DEFINE_TYPE (GooPlayerInfo, goo_player_info, GTK_TYPE_BOX)
-
-
-struct _GooPlayerInfoPrivateData {
+struct _GooPlayerInfoPrivate {
        GooWindow   *window;
        GtkWidget   *cover_frame;
        GtkWidget   *title1_label;
@@ -67,6 +64,10 @@ struct _GooPlayerInfoPrivateData {
 };
 
 
+G_DEFINE_TYPE_WITH_CODE (GooPlayerInfo, goo_player_info, GTK_TYPE_BOX,
+                        G_ADD_PRIVATE (GooPlayerInfo))
+
+
 enum {
        COVER_CLICKED,
         LAST_SIGNAL
@@ -195,8 +196,8 @@ cover_button_drag_data_received  (GtkWidget          *widget,
 static void
 goo_player_info_construct (GooPlayerInfo *info)
 {
-       GooPlayerInfoPrivateData *priv;
-       GtkWidget *vbox;
+       GooPlayerInfoPrivate *priv;
+       GtkWidget            *vbox;
 
        priv = info->priv;
 
@@ -369,10 +370,10 @@ show_all_labels (GooPlayerInfo *info)
 static void
 goo_player_info_update_state (GooPlayerInfo *info)
 {
-       GooPlayerInfoPrivateData *priv = info->priv;
-       GooPlayerState  state;
-       AlbumInfo      *album;
-       GooPlayer      *player;
+       GooPlayerInfoPrivate *priv = info->priv;
+       GooPlayerState        state;
+       AlbumInfo            *album;
+       GooPlayer            *player;
 
        if (info->priv->window == NULL)
                return;
@@ -470,10 +471,8 @@ static void
 goo_player_info_set_total_time (GooPlayerInfo  *info,
                                gint64          total_time)
 {
-       GooPlayerInfoPrivateData *priv = info->priv;
-
-       g_free (priv->total_time);
-       priv->total_time = (total_time > 0) ? _g_format_duration_for_display (total_time * 1000) : NULL;
+       g_free (info->priv->total_time);
+       info->priv->total_time = (total_time > 0) ? _g_format_duration_for_display (total_time * 1000) : NULL;
        goo_player_info_update_state (info);
 }
 
@@ -582,8 +581,6 @@ goo_player_info_class_init (GooPlayerInfoClass *class)
         GObjectClass   *gobject_class;
        GtkWidgetClass *widget_class;
 
-       g_type_class_add_private (class, sizeof (GooPlayerInfoPrivateData));
-
        gobject_class = G_OBJECT_CLASS (class);
         gobject_class->finalize = goo_player_info_finalize;
 
@@ -606,7 +603,7 @@ static void
 goo_player_info_init (GooPlayerInfo *info)
 {
        gtk_orientable_set_orientation (GTK_ORIENTABLE (info), GTK_ORIENTATION_HORIZONTAL);
-       info->priv = G_TYPE_INSTANCE_GET_PRIVATE (info, GOO_TYPE_PLAYER_INFO, GooPlayerInfoPrivateData);
+       info->priv = goo_player_info_get_instance_private (info);
 }
 
 
diff --git a/src/goo-player-info.h b/src/goo-player-info.h
index 81fee74..3d98d63 100644
--- a/src/goo-player-info.h
+++ b/src/goo-player-info.h
@@ -32,14 +32,14 @@
 #define GOO_IS_PLAYER_INFO_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GOO_TYPE_PLAYER_INFO))
 #define GOO_PLAYER_INFO_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS((obj), GOO_TYPE_PLAYER_INFO, 
GooPlayerInfoClass))
 
-typedef struct _GooPlayerInfo            GooPlayerInfo;
-typedef struct _GooPlayerInfoClass       GooPlayerInfoClass;
-typedef struct _GooPlayerInfoPrivateData GooPlayerInfoPrivateData;
+typedef struct _GooPlayerInfo        GooPlayerInfo;
+typedef struct _GooPlayerInfoClass   GooPlayerInfoClass;
+typedef struct _GooPlayerInfoPrivate GooPlayerInfoPrivate;
 
 struct _GooPlayerInfo
 {
        GtkBox __parent;
-       GooPlayerInfoPrivateData *priv;
+       GooPlayerInfoPrivate *priv;
 };
 
 struct _GooPlayerInfoClass
diff --git a/src/goo-player.c b/src/goo-player.c
index ae02910..b12812c 100644
--- a/src/goo-player.c
+++ b/src/goo-player.c
@@ -80,10 +80,9 @@ static guint goo_player_signals[LAST_SIGNAL] = { 0 };
 
 static void goo_player_finalize    (GObject *object);
 
-#define GOO_PLAYER_GET_PRIVATE_DATA(object) \
-       (G_TYPE_INSTANCE_GET_PRIVATE ((object), GOO_TYPE_PLAYER, GooPlayerPrivate))
 
-G_DEFINE_TYPE (GooPlayer, goo_player, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_CODE (GooPlayer, goo_player, G_TYPE_OBJECT,
+                        G_ADD_PRIVATE (GooPlayer))
 
 
 static void
@@ -342,8 +341,6 @@ goo_player_class_init (GooPlayerClass *class)
        gobject_class = G_OBJECT_CLASS (class);
        gobject_class->finalize = goo_player_finalize;
 
-       g_type_class_add_private (class, sizeof (GooPlayerPrivate));
-
        goo_player_signals[START] =
                 g_signal_new ("start",
                              G_TYPE_FROM_CLASS (class),
@@ -396,7 +393,7 @@ goo_player_class_init (GooPlayerClass *class)
 static void
 goo_player_init (GooPlayer *self)
 {
-       self->priv = GOO_PLAYER_GET_PRIVATE_DATA (self);
+       self->priv = goo_player_get_instance_private (self);
        self->priv->state = GOO_PLAYER_STATE_NO_DISC;
        self->priv->action = GOO_PLAYER_ACTION_NONE;
        self->priv->is_busy = FALSE;
diff --git a/src/goo-window.c b/src/goo-window.c
index f134b02..c4550ca 100644
--- a/src/goo-window.c
+++ b/src/goo-window.c
@@ -126,7 +126,8 @@ enum {
 };
 
 
-G_DEFINE_TYPE (GooWindow, goo_window, GTK_TYPE_APPLICATION_WINDOW)
+G_DEFINE_TYPE_WITH_CODE (GooWindow, goo_window, GTK_TYPE_APPLICATION_WINDOW,
+                        G_ADD_PRIVATE (GooWindow))
 
 
 static void
@@ -931,8 +932,6 @@ goo_window_class_init (GooWindowClass *class)
        GObjectClass   *gobject_class;
        GtkWidgetClass *widget_class;
 
-       g_type_class_add_private (class, sizeof (GooWindowPrivate));
-
        gobject_class = (GObjectClass*) class;
        gobject_class->finalize = goo_window_finalize;
 
@@ -1926,7 +1925,7 @@ window_size_allocate_cb (GtkWidget    *widget,
 static void
 goo_window_init (GooWindow *window)
 {
-       window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window, GOO_TYPE_WINDOW, GooWindowPrivate);
+       window->priv = goo_window_get_instance_private (window);
        window->priv->exiting = FALSE;
        window->priv->check_id = 0;
        window->priv->url_list = NULL;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]