Fix g_type_class_add_private deprecation in recent GLib

- Since GObject 2.58
- Fix bug #14775

9 files changed, 35 insertions, 40 deletions

diff --git a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c
index 665e253..72e73ac 100644
--- a/garcon-gtk/garcon-gtk-menu.c
+++ b/garcon-gtk/garcon-gtk-menu.c
@@ -99,7 +99,7 @@ static GParamSpec *menu_props[N_PROPERTIES] = { NULL, };
 
 
 
-G_DEFINE_TYPE (GarconGtkMenu, garcon_gtk_menu, GTK_TYPE_MENU)
+G_DEFINE_TYPE_WITH_PRIVATE (GarconGtkMenu, garcon_gtk_menu, GTK_TYPE_MENU)
 
 
 
@@ -109,8 +109,6 @@ garcon_gtk_menu_class_init (GarconGtkMenuClass *klass)
   GObjectClass   *gobject_class;
   GtkWidgetClass *gtkwidget_class;
 
-  g_type_class_add_private (klass, sizeof (GarconGtkMenuPrivate));
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = garcon_gtk_menu_finalize;
   gobject_class->get_property = garcon_gtk_menu_get_property;
@@ -206,7 +204,7 @@ garcon_gtk_menu_class_init (GarconGtkMenuClass *klass)
 static void
 garcon_gtk_menu_init (GarconGtkMenu *menu)
 {
-  menu->priv = G_TYPE_INSTANCE_GET_PRIVATE (menu, GARCON_GTK_TYPE_MENU, GarconGtkMenuPrivate);
+  menu->priv = garcon_gtk_menu_get_instance_private (menu);
 
   menu->priv->show_generic_names = FALSE;
   menu->priv->show_menu_icons = TRUE;
diff --git a/garcon/garcon-menu-directory.c b/garcon/garcon-menu-directory.c
index deb62ba..bb1a32d 100644
--- a/garcon/garcon-menu-directory.c
+++ b/garcon/garcon-menu-directory.c
@@ -118,7 +118,7 @@ struct _GarconMenuDirectoryPrivate
 
 
 /* TODO, maybe implement the GarconMenuElement interface */
-G_DEFINE_TYPE (GarconMenuDirectory, garcon_menu_directory, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GarconMenuDirectory, garcon_menu_directory, G_TYPE_OBJECT)
 
 
 
@@ -127,8 +127,6 @@ garcon_menu_directory_class_init (GarconMenuDirectoryClass *klass)
 {
   GObjectClass *gobject_class;
 
-  g_type_class_add_private (klass, sizeof(GarconMenuDirectoryPrivate));
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = garcon_menu_directory_finalize;
   gobject_class->get_property = garcon_menu_directory_get_property;
@@ -212,7 +210,7 @@ garcon_menu_directory_class_init (GarconMenuDirectoryClass *klass)
 static void
 garcon_menu_directory_init (GarconMenuDirectory *directory)
 {
-  directory->priv = G_TYPE_INSTANCE_GET_PRIVATE (directory, GARCON_TYPE_MENU_DIRECTORY, GarconMenuDirectoryPrivate);
+  directory->priv = garcon_menu_directory_get_instance_private (directory);
   directory->priv->file = NULL;
   directory->priv->name = NULL;
   directory->priv->icon_name = NULL;
diff --git a/garcon/garcon-menu-item-action.c b/garcon/garcon-menu-item-action.c
index dd21a0e..dbe3b4b 100644
--- a/garcon/garcon-menu-item-action.c
+++ b/garcon/garcon-menu-item-action.c
@@ -60,15 +60,13 @@ struct _GarconMenuItemActionPrivate
   gchar *icon_name;
 };
 
-G_DEFINE_TYPE (GarconMenuItemAction, garcon_menu_item_action, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GarconMenuItemAction, garcon_menu_item_action, G_TYPE_OBJECT)
 
 static void
 garcon_menu_item_action_class_init (GarconMenuItemActionClass *klass)
 {
   GObjectClass *gobject_class;
 
-  g_type_class_add_private (klass, sizeof (GarconMenuItemActionPrivate));
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = garcon_menu_item_action_finalize;
   gobject_class->get_property = garcon_menu_item_action_get_property;
@@ -120,7 +118,7 @@ garcon_menu_item_action_class_init (GarconMenuItemActionClass *klass)
 static void
 garcon_menu_item_action_init (GarconMenuItemAction *action)
 {
-  action->priv = G_TYPE_INSTANCE_GET_PRIVATE (action, GARCON_TYPE_MENU_ITEM_ACTION, GarconMenuItemActionPrivate);
+  action->priv = garcon_menu_item_action_get_instance_private (action);
 }
 
 
diff --git a/garcon/garcon-menu-item-cache.c b/garcon/garcon-menu-item-cache.c
index 5d722ed..6576b24 100644
--- a/garcon/garcon-menu-item-cache.c
+++ b/garcon/garcon-menu-item-cache.c
@@ -73,7 +73,7 @@ struct _GarconMenuItemCachePrivate
 
 
 
-G_DEFINE_TYPE (GarconMenuItemCache, garcon_menu_item_cache, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GarconMenuItemCache, garcon_menu_item_cache, G_TYPE_OBJECT)
 
 
 
@@ -82,8 +82,6 @@ garcon_menu_item_cache_class_init (GarconMenuItemCacheClass *klass)
 {
   GObjectClass *gobject_class;
 
-  g_type_class_add_private (klass, sizeof (GarconMenuItemCachePrivate));
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = garcon_menu_item_cache_finalize;
 }
@@ -93,14 +91,15 @@ garcon_menu_item_cache_class_init (GarconMenuItemCacheClass *klass)
 static void
 garcon_menu_item_cache_init (GarconMenuItemCache *cache)
 {
-  cache->priv = G_TYPE_INSTANCE_GET_PRIVATE (cache, GARCON_TYPE_MENU_ITEM_CACHE, GarconMenuItemCachePrivate);
+  cache->priv = garcon_menu_item_cache_get_instance_private (cache);
 
 #if GLIB_CHECK_VERSION (2, 32, 0)
   g_mutex_init (&cache->priv->lock);
 #endif
 
   /* Create empty hash table */
-  cache->priv->items = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+  cache->priv->items = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                              g_free,
                                               (GDestroyNotify) garcon_menu_item_unref);
 }
 
diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c
index 355e520..185733a 100644
--- a/garcon/garcon-menu-item-pool.c
+++ b/garcon/garcon-menu-item-pool.c
@@ -55,7 +55,7 @@ struct _GarconMenuItemPool
 
 
 
-G_DEFINE_TYPE (GarconMenuItemPool, garcon_menu_item_pool, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GarconMenuItemPool, garcon_menu_item_pool, G_TYPE_OBJECT)
 
 
 
@@ -64,8 +64,6 @@ garcon_menu_item_pool_class_init (GarconMenuItemPoolClass *klass)
 {
   GObjectClass *gobject_class;
 
-  g_type_class_add_private (klass, sizeof (GarconMenuItemPoolPrivate));
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = garcon_menu_item_pool_finalize;
 }
@@ -75,8 +73,9 @@ garcon_menu_item_pool_class_init (GarconMenuItemPoolClass *klass)
 static void
 garcon_menu_item_pool_init (GarconMenuItemPool *pool)
 {
-  pool->priv = G_TYPE_INSTANCE_GET_PRIVATE (pool, GARCON_TYPE_MENU_ITEM_POOL, GarconMenuItemPoolPrivate);
-  pool->priv->items = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+  pool->priv = garcon_menu_item_pool_get_instance_private (pool);
+  pool->priv->items = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                             g_free,
                                              (GDestroyNotify) garcon_menu_item_unref);
 }
 
@@ -188,10 +187,12 @@ garcon_menu_item_pool_filter_exclude (const gchar    *desktop_id,
                                       GarconMenuItem *item,
                                       GNode          *node)
 {
+  gboolean matches;
+
   g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE);
   g_return_val_if_fail (node != NULL, FALSE);
 
-  gboolean matches = garcon_menu_node_tree_rule_matches (node, item);
+  matches = garcon_menu_node_tree_rule_matches (node, item);
 
   if (matches)
     garcon_menu_item_increment_allocated (item);
diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
index 4382e9b..35f6bed 100644
--- a/garcon/garcon-menu-item.c
+++ b/garcon/garcon-menu-item.c
@@ -156,7 +156,9 @@ struct _GarconMenuItemPrivate
 
 
 G_DEFINE_TYPE_WITH_CODE (GarconMenuItem, garcon_menu_item, G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (GARCON_TYPE_MENU_ELEMENT, garcon_menu_item_element_init))
+                         G_ADD_PRIVATE (GarconMenuItem)
+                         G_IMPLEMENT_INTERFACE (GARCON_TYPE_MENU_ELEMENT,
+                                                garcon_menu_item_element_init))
 
 
 
@@ -165,8 +167,6 @@ garcon_menu_item_class_init (GarconMenuItemClass *klass)
 {
   GObjectClass *gobject_class;
 
-  g_type_class_add_private (klass, sizeof (GarconMenuItemPrivate));
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = garcon_menu_item_finalize;
   gobject_class->get_property = garcon_menu_item_get_property;
@@ -397,7 +397,7 @@ garcon_menu_item_element_init (GarconMenuElementIface *iface)
 static void
 garcon_menu_item_init (GarconMenuItem *item)
 {
-  item->priv = G_TYPE_INSTANCE_GET_PRIVATE (item, GARCON_TYPE_MENU_ITEM, GarconMenuItemPrivate);
+  item->priv = garcon_menu_item_get_instance_private (item);
 }
 
 
diff --git a/garcon/garcon-menu-merger.c b/garcon/garcon-menu-merger.c
index 24537de..0e210f4 100644
--- a/garcon/garcon-menu-merger.c
+++ b/garcon/garcon-menu-merger.c
@@ -98,8 +98,11 @@ struct _GarconMenuMergerContext
 
 
 
-G_DEFINE_TYPE_WITH_CODE (GarconMenuMerger, garcon_menu_merger, G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (GARCON_TYPE_MENU_TREE_PROVIDER, garcon_menu_merger_provider_init))
+G_DEFINE_TYPE_WITH_CODE (GarconMenuMerger, garcon_menu_merger,
+                         G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GarconMenuMerger)
+                         G_IMPLEMENT_INTERFACE (GARCON_TYPE_MENU_TREE_PROVIDER,
+                                                garcon_menu_merger_provider_init))
 
 
 
@@ -108,8 +111,6 @@ garcon_menu_merger_class_init (GarconMenuMergerClass *klass)
 {
   GObjectClass *gobject_class;
 
-  g_type_class_add_private (klass, sizeof (GarconMenuMergerPrivate));
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = garcon_menu_merger_finalize;
   gobject_class->constructed = garcon_menu_merger_constructed;
@@ -141,7 +142,7 @@ garcon_menu_merger_provider_init (GarconMenuTreeProviderIface *iface)
 static void
 garcon_menu_merger_init (GarconMenuMerger *merger)
 {
-  merger->priv = G_TYPE_INSTANCE_GET_PRIVATE (merger, GARCON_TYPE_MENU_MERGER, GarconMenuMergerPrivate);
+  merger->priv = garcon_menu_merger_get_instance_private (merger);
   merger->priv->tree_provider = NULL;
   merger->priv->menu = NULL;
   merger->priv->file_stack = NULL;
diff --git a/garcon/garcon-menu-parser.c b/garcon/garcon-menu-parser.c
index f97e3a9..34951e8 100644
--- a/garcon/garcon-menu-parser.c
+++ b/garcon/garcon-menu-parser.c
@@ -125,8 +125,11 @@ struct _GarconMenuParserPrivate
 
 
 
-G_DEFINE_TYPE_WITH_CODE (GarconMenuParser, garcon_menu_parser, G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (GARCON_TYPE_MENU_TREE_PROVIDER, garcon_menu_parser_provider_init))
+G_DEFINE_TYPE_WITH_CODE (GarconMenuParser, garcon_menu_parser,
+                         G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GarconMenuParser)
+                         G_IMPLEMENT_INTERFACE (GARCON_TYPE_MENU_TREE_PROVIDER,
+                                                garcon_menu_parser_provider_init))
 
 
 
@@ -135,8 +138,6 @@ garcon_menu_parser_class_init (GarconMenuParserClass *klass)
 {
   GObjectClass *gobject_class;
 
-  g_type_class_add_private (klass, sizeof (GarconMenuParserPrivate));
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = garcon_menu_parser_finalize;
   gobject_class->get_property = garcon_menu_parser_get_property;
@@ -167,7 +168,7 @@ garcon_menu_parser_provider_init (GarconMenuTreeProviderIface *iface)
 static void
 garcon_menu_parser_init (GarconMenuParser *parser)
 {
-  parser->priv = G_TYPE_INSTANCE_GET_PRIVATE (parser, GARCON_TYPE_MENU_PARSER, GarconMenuParserPrivate);
+  parser->priv = garcon_menu_parser_get_instance_private (parser);
   parser->priv->file = NULL;
   parser->priv->menu = NULL;
 }
diff --git a/garcon/garcon-menu.c b/garcon/garcon-menu.c
index ac7cdcc..2f9dfbd 100644
--- a/garcon/garcon-menu.c
+++ b/garcon/garcon-menu.c
@@ -220,6 +220,7 @@ struct _GarconMenuPrivate
 
 
 G_DEFINE_TYPE_WITH_CODE (GarconMenu, garcon_menu, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GarconMenu)
                          G_IMPLEMENT_INTERFACE (GARCON_TYPE_MENU_ELEMENT,
                                                 garcon_menu_element_init))
 
@@ -235,8 +236,6 @@ garcon_menu_class_init (GarconMenuClass *klass)
 {
   GObjectClass *gobject_class;
 
-  g_type_class_add_private (klass, sizeof (GarconMenuPrivate));
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = garcon_menu_finalize;
   gobject_class->get_property = garcon_menu_get_property;
@@ -317,7 +316,7 @@ garcon_menu_element_init (GarconMenuElementIface *iface)
 static void
 garcon_menu_init (GarconMenu *menu)
 {
-  menu->priv = G_TYPE_INSTANCE_GET_PRIVATE (menu, GARCON_TYPE_MENU, GarconMenuPrivate);
+  menu->priv = garcon_menu_get_instance_private (menu);
   menu->priv->file = NULL;
   menu->priv->tree = NULL;
   menu->priv->merge_files = NULL;