[nautilus] empty-view: Port to G_DECLARE* type declaration

[Ernestas Kulik <ernestask src gnome org>]

commit 24c0222e809f02a39f244566cc3f79212e7d1552
Author: Yash Singh <yashdev10p gmail com>
Date:   Thu Feb 9 00:23:21 2017 +0530

    empty-view: Port to G_DECLARE* type declaration
    
    Currently, the type declaration is done manually. This patch reduces
    the no. of macros being used and improves readability.
    It declares NautilusEmptyView as final as it is not subclassed anywhere.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=778137

 src/nautilus-empty-view.c |   18 ++++++++----------
 src/nautilus-empty-view.h |   25 ++-----------------------
 2 files changed, 10 insertions(+), 33 deletions(-)
---
diff --git a/src/nautilus-empty-view.c b/src/nautilus-empty-view.c
index e4a4198..f2bc05c 100644
--- a/src/nautilus-empty-view.c
+++ b/src/nautilus-empty-view.c
@@ -29,9 +29,10 @@
 #include "nautilus-file-utilities.h"
 #include <eel/eel-vfs-extensions.h>
 
-struct NautilusEmptyViewDetails
+struct _NautilusEmptyView
 {
-    int number_of_files;
+       NautilusFilesView parent_instance;
+       int number_of_files;
 };
 
 static GList *nautilus_empty_view_get_selection (NautilusFilesView *view);
@@ -48,7 +49,7 @@ nautilus_empty_view_add_file (NautilusFilesView *view,
 {
     static GTimer *timer = NULL;
     static gdouble cumu = 0, elaps;
-    NAUTILUS_EMPTY_VIEW (view)->details->number_of_files++;
+    NAUTILUS_EMPTY_VIEW (view)->number_of_files++;
     GdkPixbuf *icon;
 
     if (!timer)
@@ -103,7 +104,7 @@ nautilus_empty_view_get_selection_for_file_transfer (NautilusFilesView *view)
 static gboolean
 nautilus_empty_view_is_empty (NautilusFilesView *view)
 {
-    return NAUTILUS_EMPTY_VIEW (view)->details->number_of_files == 0;
+    return NAUTILUS_EMPTY_VIEW (view)->number_of_files == 0;
 }
 
 static void
@@ -116,8 +117,8 @@ nautilus_empty_view_remove_file (NautilusFilesView *view,
                                  NautilusFile      *file,
                                  NautilusDirectory *directory)
 {
-    NAUTILUS_EMPTY_VIEW (view)->details->number_of_files--;
-    g_assert (NAUTILUS_EMPTY_VIEW (view)->details->number_of_files >= 0);
+    NAUTILUS_EMPTY_VIEW (view)->number_of_files--;
+    g_assert (NAUTILUS_EMPTY_VIEW (view)->number_of_files >= 0);
 }
 
 static void
@@ -254,8 +255,6 @@ nautilus_empty_view_class_init (NautilusEmptyViewClass *class)
 {
     NautilusFilesViewClass *nautilus_files_view_class;
 
-    g_type_class_add_private (class, sizeof (NautilusEmptyViewDetails));
-
     nautilus_files_view_class = NAUTILUS_FILES_VIEW_CLASS (class);
 
     nautilus_files_view_class->add_file = nautilus_empty_view_add_file;
@@ -292,8 +291,7 @@ nautilus_empty_view_class_init (NautilusEmptyViewClass *class)
 static void
 nautilus_empty_view_init (NautilusEmptyView *empty_view)
 {
-    empty_view->details = G_TYPE_INSTANCE_GET_PRIVATE (empty_view, NAUTILUS_TYPE_EMPTY_VIEW,
-                                                       NautilusEmptyViewDetails);
+    empty_view->number_of_files = 0;
 }
 
 NautilusFilesView *
diff --git a/src/nautilus-empty-view.h b/src/nautilus-empty-view.h
index 2d95c32..c112715 100644
--- a/src/nautilus-empty-view.h
+++ b/src/nautilus-empty-view.h
@@ -26,29 +26,8 @@
 #include "nautilus-files-view.h"
 
 #define NAUTILUS_TYPE_EMPTY_VIEW nautilus_empty_view_get_type()
-#define NAUTILUS_EMPTY_VIEW(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_EMPTY_VIEW, NautilusEmptyView))
-#define NAUTILUS_EMPTY_VIEW_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_EMPTY_VIEW, NautilusEmptyViewClass))
-#define NAUTILUS_IS_EMPTY_VIEW(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_EMPTY_VIEW))
-#define NAUTILUS_IS_EMPTY_VIEW_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_EMPTY_VIEW))
-#define NAUTILUS_EMPTY_VIEW_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_EMPTY_VIEW, NautilusEmptyViewClass))
-
-typedef struct NautilusEmptyViewDetails NautilusEmptyViewDetails;
-
-typedef struct {
-       NautilusFilesView parent_instance;
-       NautilusEmptyViewDetails *details;
-} NautilusEmptyView;
-
-typedef struct {
-       NautilusFilesViewClass parent_class;
-} NautilusEmptyViewClass;
-
-GType nautilus_empty_view_get_type (void);
+G_DECLARE_FINAL_TYPE (NautilusEmptyView, nautilus_empty_view, NAUTILUS, EMPTY_VIEW, NautilusFilesView)
+
 NautilusFilesView * nautilus_empty_view_new (NautilusWindowSlot *slot);
 
 #endif /* NAUTILUS_EMPTY_VIEW_H */