[gnome-control-center] info: Use G_DEFINE_TYPE

[Robert Ancell <rancell src gnome org>]

commit 999226832c99506abe74fabfb79edc07f6794cf9
Author: Robert Ancell <robert ancell canonical com>
Date:   Mon Sep 25 16:11:32 2017 -0400

    info: Use G_DEFINE_TYPE

 panels/info/cc-info-default-apps-panel.h    |    1 -
 panels/info/cc-info-overview-panel.h        |    1 -
 panels/info/cc-info-panel.c                 |   26 +++++++----------
 panels/info/cc-info-panel.h                 |   41 +-------------------------
 panels/info/cc-info-removable-media-panel.h |    1 -
 5 files changed, 13 insertions(+), 57 deletions(-)
---
diff --git a/panels/info/cc-info-default-apps-panel.h b/panels/info/cc-info-default-apps-panel.h
index 22fccd8..7fb1d72 100644
--- a/panels/info/cc-info-default-apps-panel.h
+++ b/panels/info/cc-info-default-apps-panel.h
@@ -25,7 +25,6 @@
 G_BEGIN_DECLS
 
 #define CC_TYPE_INFO_DEFAULT_APPS_PANEL (cc_info_default_apps_panel_get_type ())
-
 G_DECLARE_FINAL_TYPE (CcInfoDefaultAppsPanel, cc_info_default_apps_panel, CC, INFO_DEFAULT_APPS_PANEL, 
CcPanel)
 
 GtkWidget *cc_info_default_apps_panel_new (void);
diff --git a/panels/info/cc-info-overview-panel.h b/panels/info/cc-info-overview-panel.h
index d9e4ff8..d81fe58 100644
--- a/panels/info/cc-info-overview-panel.h
+++ b/panels/info/cc-info-overview-panel.h
@@ -25,7 +25,6 @@
 G_BEGIN_DECLS
 
 #define CC_TYPE_INFO_OVERVIEW_PANEL (cc_info_overview_panel_get_type ())
-
 G_DECLARE_FINAL_TYPE (CcInfoOverviewPanel, cc_info_overview_panel, CC, INFO_OVERVIEW_PANEL, CcPanel)
 
 GtkWidget *cc_info_overview_panel_new (void);
diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
index 656171f..1addd16 100644
--- a/panels/info/cc-info-panel.c
+++ b/panels/info/cc-info-panel.c
@@ -47,24 +47,23 @@
 
 #include "gsd-disk-space-helper.h"
 
-#define WID(w) (GtkWidget *) gtk_builder_get_object (self->priv->builder, w)
+#define WID(w) (GtkWidget *) gtk_builder_get_object (self->builder, w)
 
-CC_PANEL_REGISTER (CcInfoPanel, cc_info_panel)
-
-#define INFO_PANEL_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_INFO_PANEL, CcInfoPanelPrivate))
-
-struct _CcInfoPanelPrivate
+struct _CcInfoPanel
 {
-  GtkBuilder    *builder;
+  CcPanel     parent_instance;
+
+  GtkBuilder *builder;
 };
 
+CC_PANEL_REGISTER (CcInfoPanel, cc_info_panel)
+
 static void
 cc_info_panel_dispose (GObject *object)
 {
-  CcInfoPanelPrivate *priv = CC_INFO_PANEL (object)->priv;
+  CcInfoPanel *self = CC_INFO_PANEL (object);
 
-  g_clear_object (&priv->builder);
+  g_clear_object (&self->builder);
 
   G_OBJECT_CLASS (cc_info_panel_parent_class)->dispose (object);
 }
@@ -74,8 +73,6 @@ cc_info_panel_class_init (CcInfoPanelClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (CcInfoPanelPrivate));
-
   object_class->dispose = cc_info_panel_dispose;
 
   g_type_ensure (CC_TYPE_INFO_OVERVIEW_PANEL);
@@ -179,12 +176,11 @@ cc_info_panel_init (CcInfoPanel *self)
 {
   GError *error = NULL;
 
-  self->priv = INFO_PANEL_PRIVATE (self);
   g_resources_register (cc_info_get_resource ());
 
-  self->priv->builder = gtk_builder_new ();
+  self->builder = gtk_builder_new ();
 
-  if (gtk_builder_add_from_resource (self->priv->builder,
+  if (gtk_builder_add_from_resource (self->builder,
                                      "/org/gnome/control-center/info/info.ui",
                                      &error) == 0)
     {
diff --git a/panels/info/cc-info-panel.h b/panels/info/cc-info-panel.h
index bf0ebd8..48863f5 100644
--- a/panels/info/cc-info-panel.h
+++ b/panels/info/cc-info-panel.h
@@ -25,45 +25,8 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_INFO_PANEL cc_info_panel_get_type()
-
-#define CC_INFO_PANEL(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-  CC_TYPE_INFO_PANEL, CcInfoPanel))
-
-#define CC_INFO_PANEL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), \
-  CC_TYPE_INFO_PANEL, CcInfoPanelClass))
-
-#define CC_IS_INFO_PANEL(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-  CC_TYPE_INFO_PANEL))
-
-#define CC_IS_INFO_PANEL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-  CC_TYPE_INFO_PANEL))
-
-#define CC_INFO_PANEL_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-  CC_TYPE_INFO_PANEL, CcInfoPanelClass))
-
-typedef struct _CcInfoPanel CcInfoPanel;
-typedef struct _CcInfoPanelClass CcInfoPanelClass;
-typedef struct _CcInfoPanelPrivate CcInfoPanelPrivate;
-
-struct _CcInfoPanel
-{
-  CcPanel parent;
-
-  CcInfoPanelPrivate *priv;
-};
-
-struct _CcInfoPanelClass
-{
-  CcPanelClass parent_class;
-};
-
-GType cc_info_panel_get_type (void) G_GNUC_CONST;
+#define CC_TYPE_INFO_PANEL (cc_info_panel_get_type ())
+G_DECLARE_FINAL_TYPE (CcInfoPanel, cc_info_panel, CC, INFO_PANEL, CcPanel)
 
 G_END_DECLS
 
diff --git a/panels/info/cc-info-removable-media-panel.h b/panels/info/cc-info-removable-media-panel.h
index dccecde..d0d1660 100644
--- a/panels/info/cc-info-removable-media-panel.h
+++ b/panels/info/cc-info-removable-media-panel.h
@@ -25,7 +25,6 @@
 G_BEGIN_DECLS
 
 #define CC_TYPE_INFO_REMOVABLE_MEDIA_PANEL (cc_info_removable_media_panel_get_type ())
-
 G_DECLARE_FINAL_TYPE (CcInfoRemovableMediaPanel, cc_info_removable_media_panel, CC, 
INFO_REMOVABLE_MEDIA_PANEL, CcPanel)