[gnome-user-share/wip/hadess/3.32.0: 1/2] extension: Fix g_type_class_add_private() deprecation warning



commit 9754b0b5f6672f00121546455f26d69c58f8b44d
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Mar 7 10:05:07 2019 +0100

    extension: Fix g_type_class_add_private() deprecation warning

 configure.ac             | 2 +-
 src/nautilus-share-bar.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 708431d..13004cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ fi
 
 AC_SUBST(HTTPD)
 
-PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.28 gio-2.0 >= 2.26 gtk+-3.0 libnotify libcanberra-gtk3)
+PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.58 gio-2.0 >= 2.26 gtk+-3.0 libnotify libcanberra-gtk3)
 AC_SUBST(USER_SHARE_CFLAGS)
 AC_SUBST(USER_SHARE_LIBS)
 
diff --git a/src/nautilus-share-bar.c b/src/nautilus-share-bar.c
index 7536c3d..5875086 100644
--- a/src/nautilus-share-bar.c
+++ b/src/nautilus-share-bar.c
@@ -38,7 +38,7 @@ enum {
        PROP_LABEL
 };
 
-G_DEFINE_TYPE (NautilusShareBar, nautilus_share_bar, GTK_TYPE_INFO_BAR)
+G_DEFINE_TYPE_WITH_CODE (NautilusShareBar, nautilus_share_bar, GTK_TYPE_INFO_BAR, 
G_ADD_PRIVATE(NautilusShareBar))
 
 static void
 nautilus_share_bar_set_property (GObject            *object,
@@ -68,8 +68,6 @@ nautilus_share_bar_class_init (NautilusShareBarClass *klass)
 
         object_class->set_property = nautilus_share_bar_set_property;
 
-        g_type_class_add_private (klass, sizeof (NautilusShareBarPrivate));
-
         g_object_class_install_property (G_OBJECT_CLASS(klass), PROP_LABEL,
                                          g_param_spec_string ("label", "label", 
                                                               "The widget's main label",
@@ -86,7 +84,7 @@ nautilus_share_bar_init (NautilusShareBar *bar)
         GtkWidget *vbox;
         PangoAttrList *attrs;
 
-        bar->priv = NAUTILUS_SHARE_BAR_GET_PRIVATE (bar);
+        bar->priv = nautilus_share_bar_get_instance_private (bar);
 
        content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (bar));
        action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (bar));


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]