[nautilus] trash-bar: port to G_DECLARE* type declaration

[Ernestas Kulik <ernestask src gnome org>]

commit 78cc1b62d666a686bafadc714c54d966b319d56c
Author: Sirbu Lavinia Stefania <sirbu lavinia stefania gmail com>
Date:   Sun Oct 2 16:31:25 2016 +0300

    trash-bar: port to G_DECLARE* type declaration
    
    Currently we are using the old GObject class declarations, which have two
    problems.
    
    One problem is that we cannot use smart pointers like g_autoptr. The other
    problem is the boilerplate code generated that makes the code less readable,
    so harder to understand.
    
    To fix this use G_DECLARE* type.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=771845

 src/nautilus-trash-bar.c |   43 ++++++++++++++++++-------------------------
 src/nautilus-trash-bar.h |   26 +++-----------------------
 2 files changed, 21 insertions(+), 48 deletions(-)
---
diff --git a/src/nautilus-trash-bar.c b/src/nautilus-trash-bar.c
index b731110..9f8dfc3 100644
--- a/src/nautilus-trash-bar.c
+++ b/src/nautilus-trash-bar.c
@@ -31,9 +31,6 @@
 #include "nautilus-file.h"
 #include "nautilus-trash-monitor.h"
 
-#define NAUTILUS_TRASH_BAR_GET_PRIVATE(o) \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((o), NAUTILUS_TYPE_TRASH_BAR, NautilusTrashBarPrivate))
-
 enum
 {
     PROP_VIEW = 1,
@@ -46,13 +43,15 @@ enum
     TRASH_BAR_RESPONSE_RESTORE
 };
 
-struct NautilusTrashBarPrivate
+struct _NautilusTrashBar
 {
+    GtkInfoBar parent_instance;
+
     NautilusFilesView *view;
     gulong selection_handler_id;
 };
 
-G_DEFINE_TYPE (NautilusTrashBar, nautilus_trash_bar, GTK_TYPE_INFO_BAR);
+G_DEFINE_TYPE (NautilusTrashBar, nautilus_trash_bar, GTK_TYPE_INFO_BAR)
 
 static void
 selection_changed_cb (NautilusFilesView *view,
@@ -74,11 +73,12 @@ selection_changed_cb (NautilusFilesView *view,
 static void
 connect_view_and_update_button (NautilusTrashBar *bar)
 {
-    bar->priv->selection_handler_id =
-        g_signal_connect (bar->priv->view, "selection-changed",
-                          G_CALLBACK (selection_changed_cb), bar);
+    bar->selection_handler_id = g_signal_connect (bar->view,
+                                                  "selection-changed",
+                                                  G_CALLBACK (selection_changed_cb),
+                                                  bar);
 
-    selection_changed_cb (bar->priv->view, bar);
+    selection_changed_cb (bar->view, bar);
 }
 
 static void
@@ -87,16 +87,14 @@ nautilus_trash_bar_set_property (GObject      *object,
                                  const GValue *value,
                                  GParamSpec   *pspec)
 {
-    NautilusTrashBar *bar;
-
-    bar = NAUTILUS_TRASH_BAR (object);
+    NautilusTrashBar *bar = NAUTILUS_TRASH_BAR (object);
 
     switch (prop_id)
     {
         case PROP_VIEW:
         {
-            bar->priv->view = g_value_get_object (value);
-            connect_view_and_update_button (bar);
+            bar->view = g_value_get_object (value);
+            connect_view_and_update_button (NAUTILUS_TRASH_BAR (object));
         }
         break;
 
@@ -111,14 +109,12 @@ nautilus_trash_bar_set_property (GObject      *object,
 static void
 nautilus_trash_bar_dispose (GObject *obj)
 {
-    NautilusTrashBar *bar;
-
-    bar = NAUTILUS_TRASH_BAR (obj);
+    NautilusTrashBar *bar = NAUTILUS_TRASH_BAR (obj);
 
-    if (bar->priv->selection_handler_id)
+    if (bar->selection_handler_id)
     {
-        g_signal_handler_disconnect (bar->priv->view, bar->priv->selection_handler_id);
-        bar->priv->selection_handler_id = 0;
+        g_signal_handler_disconnect (bar->view, bar->selection_handler_id);
+        bar->selection_handler_id = 0;
     }
 
     G_OBJECT_CLASS (nautilus_trash_bar_parent_class)->dispose (obj);
@@ -157,8 +153,6 @@ nautilus_trash_bar_class_init (NautilusTrashBarClass *klass)
                                                           G_PARAM_WRITABLE |
                                                           G_PARAM_CONSTRUCT_ONLY |
                                                           G_PARAM_STATIC_STRINGS));
-
-    g_type_class_add_private (klass, sizeof (NautilusTrashBarPrivate));
 }
 
 static void
@@ -172,7 +166,7 @@ trash_bar_response_cb (GtkInfoBar *infobar,
 
     bar = NAUTILUS_TRASH_BAR (infobar);
     window = gtk_widget_get_toplevel (GTK_WIDGET (bar));
-
+ 
     switch (response_id)
     {
         case TRASH_BAR_RESPONSE_EMPTY:
@@ -183,7 +177,7 @@ trash_bar_response_cb (GtkInfoBar *infobar,
 
         case TRASH_BAR_RESPONSE_RESTORE:
         {
-            files = nautilus_view_get_selection (NAUTILUS_VIEW (bar->priv->view));
+            files = nautilus_view_get_selection (NAUTILUS_VIEW (bar->view));
             nautilus_restore_files_from_trash (files, GTK_WINDOW (window));
             nautilus_file_list_free (files);
         }
@@ -203,7 +197,6 @@ nautilus_trash_bar_init (NautilusTrashBar *bar)
     GtkWidget *label;
     PangoAttrList *attrs;
 
-    bar->priv = NAUTILUS_TRASH_BAR_GET_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));
 
diff --git a/src/nautilus-trash-bar.h b/src/nautilus-trash-bar.h
index 18e8b15..3da0a71 100644
--- a/src/nautilus-trash-bar.h
+++ b/src/nautilus-trash-bar.h
@@ -27,31 +27,11 @@
 
 G_BEGIN_DECLS
 
-#define NAUTILUS_TYPE_TRASH_BAR         (nautilus_trash_bar_get_type ())
-#define NAUTILUS_TRASH_BAR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_TRASH_BAR, 
NautilusTrashBar))
-#define NAUTILUS_TRASH_BAR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), NAUTILUS_TYPE_TRASH_BAR, 
NautilusTrashBarClass))
-#define NAUTILUS_IS_TRASH_BAR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_TRASH_BAR))
-#define NAUTILUS_IS_TRASH_BAR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), NAUTILUS_TYPE_TRASH_BAR))
-#define NAUTILUS_TRASH_BAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NAUTILUS_TYPE_TRASH_BAR, 
NautilusTrashBarClass))
+#define NAUTILUS_TYPE_TRASH_BAR (nautilus_trash_bar_get_type ())
 
-typedef struct NautilusTrashBarPrivate NautilusTrashBarPrivate;
-
-typedef struct
-{
-       GtkInfoBar parent;
-
-       NautilusTrashBarPrivate *priv;
-} NautilusTrashBar;
-
-typedef struct
-{
-       GtkInfoBarClass parent_class;
-} NautilusTrashBarClass;
-
-GType           nautilus_trash_bar_get_type    (void) G_GNUC_CONST;
-
-GtkWidget       *nautilus_trash_bar_new         (NautilusFilesView *view);
+G_DECLARE_FINAL_TYPE (NautilusTrashBar, nautilus_trash_bar, NAUTILUS, TRASH_BAR, GtkInfoBar)
 
+GtkWidget *nautilus_trash_bar_new (NautilusFilesView *view);
 
 G_END_DECLS