From 1b928bd88276815964dd4061db013d99bfa17b80 Mon Sep 17 00:00:00 2001 From: Romain B Date: Fri, 19 Oct 2018 23:59:01 +0200 Subject: [PATCH] Resolve g_type_class_add_private deprecations - Since GObject 2.58 - Ignore deprecation when using G_DEFINE_TYPE_WITH_CODE until we find a way to fix it correctly - Fix bug #14775 --- garcon-gtk/garcon-gtk-menu.c | 4 +--- garcon/garcon-menu-directory.c | 3 +-- garcon/garcon-menu-item-action.c | 4 +--- garcon/garcon-menu-item-cache.c | 4 +--- garcon/garcon-menu-item-pool.c | 4 +--- garcon/garcon-menu-item.c | 2 ++ garcon/garcon-menu-merger.c | 2 ++ garcon/garcon-menu-parser.c | 2 ++ garcon/garcon-menu.c | 2 ++ 9 files changed, 13 insertions(+), 14 deletions(-) diff --git a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c index 665e253..b550331 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; diff --git a/garcon/garcon-menu-directory.c b/garcon/garcon-menu-directory.c index deb62ba..bad4ac0 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,7 +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; diff --git a/garcon/garcon-menu-item-action.c b/garcon/garcon-menu-item-action.c index dd21a0e..15fb983 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; diff --git a/garcon/garcon-menu-item-cache.c b/garcon/garcon-menu-item-cache.c index 5d722ed..f30aab3 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; } diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c index 9f8382b..a427cab 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; } diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c index 04ff2a0..55b74d4 100644 --- a/garcon/garcon-menu-item.c +++ b/garcon/garcon-menu-item.c @@ -165,7 +165,9 @@ garcon_menu_item_class_init (GarconMenuItemClass *klass) { GObjectClass *gobject_class; + G_GNUC_BEGIN_IGNORE_DEPRECATIONS /* GObject 2.58 */ g_type_class_add_private (klass, sizeof (GarconMenuItemPrivate)); + G_GNUC_END_IGNORE_DEPRECATIONS gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = garcon_menu_item_finalize; diff --git a/garcon/garcon-menu-merger.c b/garcon/garcon-menu-merger.c index 24537de..288df48 100644 --- a/garcon/garcon-menu-merger.c +++ b/garcon/garcon-menu-merger.c @@ -108,7 +108,9 @@ garcon_menu_merger_class_init (GarconMenuMergerClass *klass) { GObjectClass *gobject_class; + G_GNUC_BEGIN_IGNORE_DEPRECATIONS /* GObject 2.58 */ g_type_class_add_private (klass, sizeof (GarconMenuMergerPrivate)); + G_GNUC_END_IGNORE_DEPRECATIONS gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = garcon_menu_merger_finalize; diff --git a/garcon/garcon-menu-parser.c b/garcon/garcon-menu-parser.c index f97e3a9..c083367 100644 --- a/garcon/garcon-menu-parser.c +++ b/garcon/garcon-menu-parser.c @@ -135,7 +135,9 @@ garcon_menu_parser_class_init (GarconMenuParserClass *klass) { GObjectClass *gobject_class; + G_GNUC_BEGIN_IGNORE_DEPRECATIONS /* GObject 2.58 */ g_type_class_add_private (klass, sizeof (GarconMenuParserPrivate)); + G_GNUC_END_IGNORE_DEPRECATIONS gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = garcon_menu_parser_finalize; diff --git a/garcon/garcon-menu.c b/garcon/garcon-menu.c index ac7cdcc..88e1b1c 100644 --- a/garcon/garcon-menu.c +++ b/garcon/garcon-menu.c @@ -235,7 +235,9 @@ garcon_menu_class_init (GarconMenuClass *klass) { GObjectClass *gobject_class; + G_GNUC_BEGIN_IGNORE_DEPRECATIONS /* GObject 2.58 */ g_type_class_add_private (klass, sizeof (GarconMenuPrivate)); + G_GNUC_END_IGNORE_DEPRECATIONS gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = garcon_menu_finalize; -- 2.19.1