[gedit] progress-info-bar: use G_DECLARE

[Paolo Borelli <pborelli src gnome org>]

commit ac4adaa1a7af63eac1996d58b34c8bbfd7c6a479
Author: Paolo Borelli <pborelli gnome org>
Date:   Sun Sep 13 18:35:00 2015 +0200

    progress-info-bar: use G_DECLARE

 gedit/gedit-progress-info-bar.c |   49 ++++++++++++++++++++------------------
 gedit/gedit-progress-info-bar.h |   45 ++---------------------------------
 2 files changed, 29 insertions(+), 65 deletions(-)
---
diff --git a/gedit/gedit-progress-info-bar.c b/gedit/gedit-progress-info-bar.c
index eb09ff6..d547189 100644
--- a/gedit/gedit-progress-info-bar.c
+++ b/gedit/gedit-progress-info-bar.c
@@ -23,17 +23,22 @@
 
 enum {
        PROP_0,
-       PROP_HAS_CANCEL_BUTTON
+       PROP_HAS_CANCEL_BUTTON,
+       LAST_PROP
 };
 
-struct _GeditProgressInfoBarPrivate
+static GParamSpec *properties[LAST_PROP];
+
+struct _GeditProgressInfoBar
 {
+       GtkInfoBar parent_instance;
+
        GtkWidget *image;
        GtkWidget *label;
        GtkWidget *progress;
 };
 
-G_DEFINE_TYPE_WITH_PRIVATE (GeditProgressInfoBar, gedit_progress_info_bar, GTK_TYPE_INFO_BAR)
+G_DEFINE_TYPE (GeditProgressInfoBar, gedit_progress_info_bar, GTK_TYPE_INFO_BAR)
 
 static void
 gedit_progress_info_bar_set_has_cancel_button (GeditProgressInfoBar *bar,
@@ -75,29 +80,28 @@ gedit_progress_info_bar_class_init (GeditProgressInfoBarClass *klass)
 
        gobject_class->set_property = gedit_progress_info_bar_set_property;
 
-       g_object_class_install_property (gobject_class,
-                                        PROP_HAS_CANCEL_BUTTON,
-                                        g_param_spec_boolean ("has-cancel-button",
-                                                              "Has Cancel Button",
-                                                              "If the message bar has a cancel button",
-                                                              TRUE,
-                                                              G_PARAM_WRITABLE |
-                                                              G_PARAM_CONSTRUCT_ONLY |
-                                                              G_PARAM_STATIC_STRINGS));
+       properties[PROP_HAS_CANCEL_BUTTON] =
+                g_param_spec_boolean ("has-cancel-button",
+                                      "Has Cancel Button",
+                                      "If the message bar has a cancel button",
+                                      TRUE,
+                                      G_PARAM_WRITABLE |
+                                      G_PARAM_CONSTRUCT_ONLY |
+                                      G_PARAM_STATIC_STRINGS);
+
+       g_object_class_install_properties (gobject_class, LAST_PROP, properties);
 
        /* Bind class to template */
        gtk_widget_class_set_template_from_resource (widget_class,
                                                     "/org/gnome/gedit/ui/gedit-progress-info-bar.ui");
-       gtk_widget_class_bind_template_child_private (widget_class, GeditProgressInfoBar, image);
-       gtk_widget_class_bind_template_child_private (widget_class, GeditProgressInfoBar, label);
-       gtk_widget_class_bind_template_child_private (widget_class, GeditProgressInfoBar, progress);
+       gtk_widget_class_bind_template_child (widget_class, GeditProgressInfoBar, image);
+       gtk_widget_class_bind_template_child (widget_class, GeditProgressInfoBar, label);
+       gtk_widget_class_bind_template_child (widget_class, GeditProgressInfoBar, progress);
 }
 
 static void
 gedit_progress_info_bar_init (GeditProgressInfoBar *bar)
 {
-       bar->priv = gedit_progress_info_bar_get_instance_private (bar);
-
        gtk_widget_init_template (GTK_WIDGET (bar));
 }
 
@@ -128,7 +132,7 @@ gedit_progress_info_bar_set_icon_name (GeditProgressInfoBar *bar,
        g_return_if_fail (GEDIT_IS_PROGRESS_INFO_BAR (bar));
        g_return_if_fail (icon_name != NULL);
 
-       gtk_image_set_from_icon_name (GTK_IMAGE (bar->priv->image),
+       gtk_image_set_from_icon_name (GTK_IMAGE (bar->image),
                                      icon_name,
                                      GTK_ICON_SIZE_SMALL_TOOLBAR);
 }
@@ -140,7 +144,7 @@ gedit_progress_info_bar_set_markup (GeditProgressInfoBar *bar,
        g_return_if_fail (GEDIT_IS_PROGRESS_INFO_BAR (bar));
        g_return_if_fail (markup != NULL);
 
-       gtk_label_set_markup (GTK_LABEL (bar->priv->label), markup);
+       gtk_label_set_markup (GTK_LABEL (bar->label), markup);
 }
 
 void
@@ -150,7 +154,7 @@ gedit_progress_info_bar_set_text (GeditProgressInfoBar *bar,
        g_return_if_fail (GEDIT_IS_PROGRESS_INFO_BAR (bar));
        g_return_if_fail (text != NULL);
 
-       gtk_label_set_text (GTK_LABEL (bar->priv->label), text);
+       gtk_label_set_text (GTK_LABEL (bar->label), text);
 }
 
 void
@@ -159,8 +163,7 @@ gedit_progress_info_bar_set_fraction (GeditProgressInfoBar *bar,
 {
        g_return_if_fail (GEDIT_IS_PROGRESS_INFO_BAR (bar));
 
-       gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar->priv->progress),
-                                      fraction);
+       gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar->progress), fraction);
 }
 
 void
@@ -168,7 +171,7 @@ gedit_progress_info_bar_pulse (GeditProgressInfoBar *bar)
 {
        g_return_if_fail (GEDIT_IS_PROGRESS_INFO_BAR (bar));
 
-       gtk_progress_bar_pulse (GTK_PROGRESS_BAR (bar->priv->progress));
+       gtk_progress_bar_pulse (GTK_PROGRESS_BAR (bar->progress));
 }
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-progress-info-bar.h b/gedit/gedit-progress-info-bar.h
index b54e965..cf57412 100644
--- a/gedit/gedit-progress-info-bar.h
+++ b/gedit/gedit-progress-info-bar.h
@@ -25,48 +25,10 @@
 
 G_BEGIN_DECLS
 
-/*
- * Type checking and casting macros
- */
-#define GEDIT_TYPE_PROGRESS_INFO_BAR              (gedit_progress_info_bar_get_type())
-#define GEDIT_PROGRESS_INFO_BAR(obj)              (G_TYPE_CHECK_INSTANCE_CAST((obj), 
GEDIT_TYPE_PROGRESS_INFO_BAR, GeditProgressInfoBar))
-#define GEDIT_PROGRESS_INFO_BAR_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), 
GEDIT_TYPE_PROGRESS_INFO_BAR, GeditProgressInfoBarClass))
-#define GEDIT_IS_PROGRESS_INFO_BAR(obj)           (G_TYPE_CHECK_INSTANCE_TYPE((obj), 
GEDIT_TYPE_PROGRESS_INFO_BAR))
-#define GEDIT_IS_PROGRESS_INFO_BAR_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), 
GEDIT_TYPE_PROGRESS_INFO_BAR))
-#define GEDIT_PROGRESS_INFO_BAR_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS((obj), 
GEDIT_TYPE_PROGRESS_INFO_BAR, GeditProgressInfoBarClass))
-
-/* Private structure type */
-typedef struct _GeditProgressInfoBarPrivate GeditProgressInfoBarPrivate;
-
-/*
- * Main object structure
- */
-typedef struct _GeditProgressInfoBar GeditProgressInfoBar;
-
-struct _GeditProgressInfoBar
-{
-       GtkInfoBar parent;
-
-       /*< private > */
-       GeditProgressInfoBarPrivate *priv;
-};
+#define GEDIT_TYPE_PROGRESS_INFO_BAR (gedit_progress_info_bar_get_type ())
+G_DECLARE_FINAL_TYPE (GeditProgressInfoBar, gedit_progress_info_bar, GEDIT, PROGRESS_INFO_BAR, GtkInfoBar)
 
-/*
- * Class definition
- */
-typedef struct _GeditProgressInfoBarClass GeditProgressInfoBarClass;
-
-struct _GeditProgressInfoBarClass
-{
-       GtkInfoBarClass parent_class;
-};
-
-/*
- * Public methods
- */
-GType           gedit_progress_info_bar_get_type               (void) G_GNUC_CONST;
-
-GtkWidget      *gedit_progress_info_bar_new                    (const gchar          *icon_name,
+GtkWidget      *gedit_progress_info_bar_new                    (const gchar          *icon_name,
                                                                 const gchar          *markup,
                                                                 gboolean              has_cancel);
 
@@ -84,7 +46,6 @@ void           gedit_progress_info_bar_set_fraction           (GeditProgressInfoBar *bar,
 
 void            gedit_progress_info_bar_pulse                  (GeditProgressInfoBar *bar);
 
-
 G_END_DECLS
 
 #endif  /* __GEDIT_PROGRESS_INFO_BAR_H__  */