[gnome-software] dbus helper: Port to G_DECLARE_FINAL_TYPE macro



commit 73fac14cbf6e36ed8a611eda818db4821427fe86
Author: Kalev Lember <klember redhat com>
Date:   Mon Sep 7 16:54:19 2015 +0200

    dbus helper: Port to G_DECLARE_FINAL_TYPE macro

 src/gs-dbus-helper.c |    4 ----
 src/gs-dbus-helper.h |   11 ++---------
 2 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/src/gs-dbus-helper.c b/src/gs-dbus-helper.c
index 9071367..12ff95b 100644
--- a/src/gs-dbus-helper.c
+++ b/src/gs-dbus-helper.c
@@ -44,10 +44,6 @@ struct _GsDbusHelper {
        guint                    dbus_own_name_id;
 };
 
-struct _GsDbusHelperClass {
-       GObjectClass     parent_class;
-};
-
 G_DEFINE_TYPE (GsDbusHelper, gs_dbus_helper, G_TYPE_OBJECT)
 
 typedef struct {
diff --git a/src/gs-dbus-helper.h b/src/gs-dbus-helper.h
index d38ca68..2fefbf5 100644
--- a/src/gs-dbus-helper.h
+++ b/src/gs-dbus-helper.h
@@ -26,17 +26,10 @@
 
 G_BEGIN_DECLS
 
-#define GS_TYPE_DBUS_HELPER            (gs_dbus_helper_get_type ())
-#define GS_DBUS_HELPER(o)              (G_TYPE_CHECK_INSTANCE_CAST ((o), GS_TYPE_DBUS_HELPER, GsDbusHelper))
-#define GS_DBUS_HELPER_CLASS(k)                (G_TYPE_CHECK_CLASS_CAST((k), GS_TYPE_DBUS_HELPER, 
GsDbusHelperClass))
-#define GS_IS_DBUS_HELPER(o)           (G_TYPE_CHECK_INSTANCE_TYPE ((o), GS_TYPE_DBUS_HELPER))
-#define GS_IS_DBUS_HELPER_CLASS(k)     (G_TYPE_CHECK_CLASS_TYPE ((k), GS_TYPE_DBUS_HELPER))
-#define GS_DBUS_HELPER_GET_CLASS(o)    (G_TYPE_INSTANCE_GET_CLASS ((o), GS_TYPE_DBUS_HELPER, 
GsDbusHelperClass))
+#define GS_TYPE_DBUS_HELPER (gs_dbus_helper_get_type ())
 
-typedef struct _GsDbusHelper           GsDbusHelper;
-typedef struct _GsDbusHelperClass      GsDbusHelperClass;
+G_DECLARE_FINAL_TYPE (GsDbusHelper, gs_dbus_helper, GS, DBUS_HELPER, GObject)
 
-GType           gs_dbus_helper_get_type        (void);
 GsDbusHelper   *gs_dbus_helper_new             (void);
 
 G_END_DECLS


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