[nautilus] freedesktop-dbus: Migrate to G_DECLARE_FINAL_TYPE



commit 01f58776366b6d4269caa43b8562c8d9e6b5175d
Author: Yi-Soo An <yisooan gmail com>
Date:   Thu Nov 22 12:21:07 2018 +0900

    freedesktop-dbus: Migrate to G_DECLARE_FINAL_TYPE
    
    Use the convenience macro instead of manually declaring necessary macros.

 src/nautilus-freedesktop-dbus.c |  8 +-------
 src/nautilus-freedesktop-dbus.h | 18 +++---------------
 2 files changed, 4 insertions(+), 22 deletions(-)
---
diff --git a/src/nautilus-freedesktop-dbus.c b/src/nautilus-freedesktop-dbus.c
index 3371d7c7f..98b02d2de 100644
--- a/src/nautilus-freedesktop-dbus.c
+++ b/src/nautilus-freedesktop-dbus.c
@@ -47,11 +47,6 @@ struct _NautilusFreedesktopDBus
     gboolean name_lost;
 };
 
-struct _NautilusFreedesktopDBusClass
-{
-    GObjectClass parent_class;
-};
-
 G_DEFINE_TYPE (NautilusFreedesktopDBus, nautilus_freedesktop_dbus, G_TYPE_OBJECT);
 
 static gboolean
@@ -333,6 +328,5 @@ nautilus_freedesktop_dbus_set_open_windows_with_locations (NautilusFreedesktopDB
 NautilusFreedesktopDBus *
 nautilus_freedesktop_dbus_new (void)
 {
-    return g_object_new (nautilus_freedesktop_dbus_get_type (),
-                         NULL);
+    return g_object_new (NAUTILUS_TYPE_FREEDESKTOP_DBUS, NULL);
 }
diff --git a/src/nautilus-freedesktop-dbus.h b/src/nautilus-freedesktop-dbus.h
index 6c54be6c4..416900eb9 100644
--- a/src/nautilus-freedesktop-dbus.h
+++ b/src/nautilus-freedesktop-dbus.h
@@ -27,21 +27,9 @@
 #define NAUTILUS_FDO_DBUS_PATH  "/org/freedesktop/FileManager1"
 
 #define NAUTILUS_TYPE_FREEDESKTOP_DBUS nautilus_freedesktop_dbus_get_type()
-#define NAUTILUS_FREEDESKTOP_DBUS(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_FREEDESKTOP_DBUS, NautilusFreedesktopDBus))
-#define NAUTILUS_FREEDESKTOP_DBUS_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_FREEDESKTOP_DBUS, NautilusFreedesktopDBusClass))
-#define NAUTILUS_IS_FREEDESKTOP_DBUS(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_FREEDESKTOP_DBUS))
-#define NAUTILUS_IS_FREEDESKTOP_DBUS_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_FREEDESKTOP_DBUS))
-#define NAUTILUS_FREEDESKTOP_DBUS_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_FREEDESKTOP_DBUS, NautilusFreedesktopDBusClass))
-
-typedef struct _NautilusFreedesktopDBus NautilusFreedesktopDBus;
-typedef struct _NautilusFreedesktopDBusClass NautilusFreedesktopDBusClass;
-
-GType nautilus_freedesktop_dbus_get_type (void);
+
+G_DECLARE_FINAL_TYPE (NautilusFreedesktopDBus, nautilus_freedesktop_dbus, NAUTILUS, FREEDESKTOP_DBUS, 
GObject);
+
 NautilusFreedesktopDBus * nautilus_freedesktop_dbus_new (void);
 
 void nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDBus *fdb, const gchar **locations);


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