Replace old-fashioned GObject boilerplate with G_DEFINE_TYPEwip/rancell/g-define-type

As well as simplifying the code this allows us to make use of the g_auto memory
management macros.

1 files changed, 2 insertions, 22 deletions

diff --git a/panels/background/cc-background-xml.h b/panels/background/cc-background-xml.h
index 67f522e8e..bf0687f78 100644
--- a/panels/background/cc-background-xml.h
+++ b/panels/background/cc-background-xml.h
@@ -26,28 +26,8 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_BACKGROUND_XML         (cc_background_xml_get_type ())
-#define CC_BACKGROUND_XML(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), CC_TYPE_BACKGROUND_XML, CcBackgroundXml))
-#define CC_BACKGROUND_XML_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), CC_TYPE_BACKGROUND_XML, CcBackgroundXmlClass))
-#define CC_IS_BACKGROUND_XML(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), CC_TYPE_BACKGROUND_XML))
-#define CC_IS_BACKGROUND_XML_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), CC_TYPE_BACKGROUND_XML))
-#define CC_BACKGROUND_XML_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CC_TYPE_BACKGROUND_XML, CcBackgroundXmlClass))
-
-typedef struct CcBackgroundXmlPrivate CcBackgroundXmlPrivate;
-
-typedef struct
-{
-  GObject parent;
-  CcBackgroundXmlPrivate *priv;
-} CcBackgroundXml;
-
-typedef struct
-{
-  GObjectClass parent_class;
-  void (*added) (CcBackgroundXml *xml, GObject *item);
-} CcBackgroundXmlClass;
-
-GType              cc_background_xml_get_type (void);
+#define CC_TYPE_BACKGROUND_XML (cc_background_xml_get_type ())
+G_DECLARE_FINAL_TYPE (CcBackgroundXml, cc_background_xml, CC, BACKGROUND_XML, GObject)
 
 CcBackgroundXml *cc_background_xml_new (void);