keyboard: remove boilerplate code

After introducing the autocleanup function to
CcPanel, it is now possible to remove a lot of
boilerplate code from the panels.

This commit ports CcKeyboardPanel to be a final
type, removing all the old boilerplate code in
the proccess.

https://bugzilla.gnome.org/show_bug.cgi?id=769063

panels/keyboard/cc-keyboard-panel.c

@@ -23,16 +23,15 @@
 
 #include "keyboard-shortcuts.h"
 
-CC_PANEL_REGISTER (CcKeyboardPanel, cc_keyboard_panel)
+struct _CcKeyboardPanel
-
-#define KEYBOARD_PANEL_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_KEYBOARD_PANEL, CcKeyboardPanelPrivate))
-
-struct _CcKeyboardPanelPrivate
 {
+  CcPanel             parent;
+
   GtkBuilder         *builder;
 };
 
+CC_PANEL_REGISTER (CcKeyboardPanel, cc_keyboard_panel)
+
 enum {
   PROP_0,
   PROP_PARAMETERS
@@ -60,7 +59,7 @@ cc_keyboard_panel_set_page (CcKeyboardPanel *panel,
     return;
   }
 
-  notebook = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "keyboard_notebook"));
+  notebook = GTK_WIDGET (gtk_builder_get_object (panel->builder, "keyboard_notebook"));
   gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), page_num);
 
   if (page_num == SHORTCUTS_PAGE &&
@@ -120,18 +119,15 @@ cc_keyboard_panel_constructor (GType                  gtype,
 {
   GObject *obj;
   CcKeyboardPanel *self;
-  CcKeyboardPanelPrivate *priv;
   GtkWidget *widget;
 
   obj = G_OBJECT_CLASS (cc_keyboard_panel_parent_class)->constructor (gtype, n_properties, properties);
 
   self = CC_KEYBOARD_PANEL (obj);
-  priv = self->priv;
 
-  keyboard_shortcuts_init (CC_PANEL (self), priv->builder);
+  keyboard_shortcuts_init (CC_PANEL (self), self->builder);
 
-  widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
+  widget = (GtkWidget *) gtk_builder_get_object (self->builder, "shortcuts_page");
-                                                 "shortcuts_page");
 
   gtk_container_add (GTK_CONTAINER (self), widget);
 
@@ -157,8 +153,8 @@ cc_keyboard_panel_finalize (GObject *object)
 {
   CcKeyboardPanel *panel = CC_KEYBOARD_PANEL (object);
 
-  if (panel->priv->builder)
+  if (panel->builder)
-    g_object_unref (panel->priv->builder);
+    g_object_unref (panel->builder);
 
   G_OBJECT_CLASS (cc_keyboard_panel_parent_class)->finalize (object);
 }
@@ -169,8 +165,6 @@ cc_keyboard_panel_class_init (CcKeyboardPanelClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   CcPanelClass *panel_class = CC_PANEL_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (CcKeyboardPanelPrivate));
-
   panel_class->get_help_uri = cc_keyboard_panel_get_help_uri;
 
   object_class->constructor = cc_keyboard_panel_constructor;
@@ -184,21 +178,19 @@ cc_keyboard_panel_class_init (CcKeyboardPanelClass *klass)
 static void
 cc_keyboard_panel_init (CcKeyboardPanel *self)
 {
-  CcKeyboardPanelPrivate *priv;
   GError *error = NULL;
 
-  priv = self->priv = KEYBOARD_PANEL_PRIVATE (self);
   g_resources_register (cc_keyboard_get_resource ());
 
-  priv->builder = gtk_builder_new ();
+  self->builder = gtk_builder_new ();
 
-  if (gtk_builder_add_from_resource (priv->builder,
+  if (gtk_builder_add_from_resource (self->builder,
                                      "/org/gnome/control-center/keyboard/gnome-keyboard-panel.ui",
                                      &error) == 0)
     {
       g_warning ("Could not load UI: %s", error->message);
       g_clear_error (&error);
-      g_object_unref (priv->builder);
+      g_object_unref (self->builder);
-      priv->builder = NULL;
+      self->builder = NULL;
     }
 }

panels/keyboard/cc-keyboard-panel.h

@@ -26,45 +26,9 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_KEYBOARD_PANEL cc_keyboard_panel_get_type()
+#define CC_TYPE_KEYBOARD_PANEL (cc_keyboard_panel_get_type())
 
-#define CC_KEYBOARD_PANEL(obj) \
+G_DECLARE_FINAL_TYPE (CcKeyboardPanel, cc_keyboard_panel, CC, KEYBOARD_PANEL, CcPanel)
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-  CC_TYPE_KEYBOARD_PANEL, CcKeyboardPanel))
-
-#define CC_KEYBOARD_PANEL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), \
-  CC_TYPE_KEYBOARD_PANEL, CcKeyboardPanelClass))
-
-#define CC_IS_KEYBOARD_PANEL(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-  CC_TYPE_KEYBOARD_PANEL))
-
-#define CC_IS_KEYBOARD_PANEL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-  CC_TYPE_KEYBOARD_PANEL))
-
-#define CC_KEYBOARD_PANEL_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-  CC_TYPE_KEYBOARD_PANEL, CcKeyboardPanelClass))
-
-typedef struct _CcKeyboardPanel CcKeyboardPanel;
-typedef struct _CcKeyboardPanelClass CcKeyboardPanelClass;
-typedef struct _CcKeyboardPanelPrivate CcKeyboardPanelPrivate;
-
-struct _CcKeyboardPanel
-{
-  CcPanel parent;
-
-  CcKeyboardPanelPrivate *priv;
-};
-
-struct _CcKeyboardPanelClass
-{
-  CcPanelClass parent_class;
-};
-
-GType cc_keyboard_panel_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS