[gnome-photos] header-bar: Make it a final class

[Debarshi Ray <debarshir src gnome org>]

commit b31bf2cd2cac4279dd9d9df61c1155a58178fbda
Author: Debarshi Ray <debarshir gnome org>
Date:   Thu Mar 24 12:51:16 2016 +0100

    header-bar: Make it a final class

 src/photos-header-bar.c |   57 ++++++++++++++++++++++------------------------
 src/photos-header-bar.h |   28 +---------------------
 2 files changed, 29 insertions(+), 56 deletions(-)
---
diff --git a/src/photos-header-bar.c b/src/photos-header-bar.c
index d753121..6f2d2fb 100644
--- a/src/photos-header-bar.c
+++ b/src/photos-header-bar.c
@@ -28,26 +28,31 @@
 #include "photos-header-bar.h"
 
 
-struct _PhotosHeaderBarPrivate
+struct _PhotosHeaderBar
 {
+  GtkHeaderBar parent_instance;
   GtkWidget *selection_menu;
   GtkWidget *stack_switcher;
   PhotosHeaderBarMode mode;
 };
 
+struct _PhotosHeaderBarClass
+{
+  GtkHeaderBarClass parent_class;
+};
+
 
-G_DEFINE_TYPE_WITH_PRIVATE (PhotosHeaderBar, photos_header_bar, GTK_TYPE_HEADER_BAR);
+G_DEFINE_TYPE (PhotosHeaderBar, photos_header_bar, GTK_TYPE_HEADER_BAR);
 
 
 static void
 photos_header_bar_realize (GtkWidget *widget)
 {
   PhotosHeaderBar *self = PHOTOS_HEADER_BAR (widget);
-  PhotosHeaderBarPrivate *priv = self->priv;
 
   GTK_WIDGET_CLASS (photos_header_bar_parent_class)->realize (widget);
 
-  if (priv->mode == PHOTOS_HEADER_BAR_MODE_NONE)
+  if (self->mode == PHOTOS_HEADER_BAR_MODE_NONE)
     photos_header_bar_set_mode (self, PHOTOS_HEADER_BAR_MODE_NORMAL);
 }
 
@@ -56,10 +61,9 @@ static void
 photos_header_bar_dispose (GObject *object)
 {
   PhotosHeaderBar *self = PHOTOS_HEADER_BAR (object);
-  PhotosHeaderBarPrivate *priv = self->priv;
 
-  g_clear_object (&priv->selection_menu);
-  g_clear_object (&priv->stack_switcher);
+  g_clear_object (&self->selection_menu);
+  g_clear_object (&self->stack_switcher);
 
   G_OBJECT_CLASS (photos_header_bar_parent_class)->dispose (object);
 }
@@ -68,18 +72,14 @@ photos_header_bar_dispose (GObject *object)
 static void
 photos_header_bar_init (PhotosHeaderBar *self)
 {
-  PhotosHeaderBarPrivate *priv;
   GtkStyleContext *context;
 
-  self->priv = photos_header_bar_get_instance_private (self);
-  priv = self->priv;
-
   context = gtk_widget_get_style_context (GTK_WIDGET (self));
   gtk_style_context_add_class (context, "titlebar");
 
-  priv->stack_switcher = g_object_ref_sink (gtk_stack_switcher_new ());
-  gtk_widget_show (priv->stack_switcher);
-  gtk_widget_set_no_show_all (priv->stack_switcher, TRUE);
+  self->stack_switcher = g_object_ref_sink (gtk_stack_switcher_new ());
+  gtk_widget_show (self->stack_switcher);
+  gtk_widget_set_no_show_all (self->stack_switcher, TRUE);
 }
 
 
@@ -107,7 +107,7 @@ photos_header_bar_clear (PhotosHeaderBar *self)
   GList *children;
   GList *l;
 
-  self->priv->mode = PHOTOS_HEADER_BAR_MODE_NONE;
+  self->mode = PHOTOS_HEADER_BAR_MODE_NONE;
   gtk_header_bar_set_custom_title (GTK_HEADER_BAR (self), NULL);
 
   children = gtk_container_get_children (GTK_CONTAINER (self));
@@ -119,26 +119,25 @@ photos_header_bar_clear (PhotosHeaderBar *self)
 void
 photos_header_bar_set_mode (PhotosHeaderBar *self, PhotosHeaderBarMode mode)
 {
-  PhotosHeaderBarPrivate *priv = self->priv;
   GtkStyleContext *context;
   GtkWidget *custom_title = NULL;
 
-  if (priv->mode == mode || !gtk_widget_get_realized (GTK_WIDGET (self)))
+  if (self->mode == mode || !gtk_widget_get_realized (GTK_WIDGET (self)))
     return;
 
-  priv->mode = mode;
+  self->mode = mode;
   context = gtk_widget_get_style_context (GTK_WIDGET (self));
 
-  switch (priv->mode)
+  switch (self->mode)
     {
     case PHOTOS_HEADER_BAR_MODE_NORMAL:
       gtk_style_context_remove_class (context, "selection-mode");
-      custom_title = priv->stack_switcher;
+      custom_title = self->stack_switcher;
       break;
 
     case PHOTOS_HEADER_BAR_MODE_SELECTION:
       gtk_style_context_add_class (context, "selection-mode");
-      custom_title = priv->selection_menu;
+      custom_title = self->selection_menu;
       break;
 
     case PHOTOS_HEADER_BAR_MODE_STANDALONE:
@@ -157,28 +156,26 @@ photos_header_bar_set_mode (PhotosHeaderBar *self, PhotosHeaderBarMode mode)
 void
 photos_header_bar_set_selection_menu (PhotosHeaderBar *self, GtkButton *selection_menu)
 {
-  PhotosHeaderBarPrivate *priv = self->priv;
-
-  if (priv->selection_menu == GTK_WIDGET (selection_menu))
+  if (self->selection_menu == GTK_WIDGET (selection_menu))
     return;
 
-  g_clear_object (&priv->selection_menu);
+  g_clear_object (&self->selection_menu);
   if (selection_menu != NULL)
     {
       GtkStyleContext *context;
 
-      priv->selection_menu = g_object_ref_sink (selection_menu);
-      context = gtk_widget_get_style_context (priv->selection_menu);
+      self->selection_menu = g_object_ref_sink (selection_menu);
+      context = gtk_widget_get_style_context (self->selection_menu);
       gtk_style_context_add_class (context, "selection-menu");
     }
 
-  if (priv->mode == PHOTOS_HEADER_BAR_MODE_SELECTION)
-    gtk_header_bar_set_custom_title (GTK_HEADER_BAR (self), priv->selection_menu);
+  if (self->mode == PHOTOS_HEADER_BAR_MODE_SELECTION)
+    gtk_header_bar_set_custom_title (GTK_HEADER_BAR (self), self->selection_menu);
 }
 
 
 void
 photos_header_bar_set_stack (PhotosHeaderBar *self, GtkStack *stack)
 {
-  gtk_stack_switcher_set_stack (GTK_STACK_SWITCHER (self->priv->stack_switcher), stack);
+  gtk_stack_switcher_set_stack (GTK_STACK_SWITCHER (self->stack_switcher), stack);
 }
diff --git a/src/photos-header-bar.h b/src/photos-header-bar.h
index c157cc9..03e911a 100644
--- a/src/photos-header-bar.h
+++ b/src/photos-header-bar.h
@@ -36,22 +36,10 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
    PHOTOS_TYPE_HEADER_BAR, PhotosHeaderBar))
 
-#define PHOTOS_HEADER_BAR_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), \
-   PHOTOS_TYPE_HEADER_BAR, PhotosHeaderBarClass))
-
 #define PHOTOS_IS_HEADER_BAR(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
    PHOTOS_TYPE_HEADER_BAR))
 
-#define PHOTOS_IS_HEADER_BAR_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-   PHOTOS_TYPE_HEADER_BAR))
-
-#define PHOTOS_HEADER_BAR_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-   PHOTOS_TYPE_HEADER_BAR, PhotosHeaderBarClass))
-
 typedef enum
 {
   PHOTOS_HEADER_BAR_MODE_NONE,
@@ -60,20 +48,8 @@ typedef enum
   PHOTOS_HEADER_BAR_MODE_STANDALONE
 } PhotosHeaderBarMode;
 
-typedef struct _PhotosHeaderBar        PhotosHeaderBar;
-typedef struct _PhotosHeaderBarClass   PhotosHeaderBarClass;
-typedef struct _PhotosHeaderBarPrivate PhotosHeaderBarPrivate;
-
-struct _PhotosHeaderBar
-{
-  GtkHeaderBar parent_instance;
-  PhotosHeaderBarPrivate *priv;
-};
-
-struct _PhotosHeaderBarClass
-{
-  GtkHeaderBarClass parent_class;
-};
+typedef struct _PhotosHeaderBar      PhotosHeaderBar;
+typedef struct _PhotosHeaderBarClass PhotosHeaderBarClass;
 
 GType                  photos_header_bar_get_type               (void) G_GNUC_CONST;