[devhelp/wip/stuff: 3/3] window: fix api break on templates from gtk+

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 979f26adad85015066d1fc82d63fbc70288cadba
Author: Ignacio Casal Quinteiro <ignacio casal nice-software com>
Date:   Fri Jul 26 16:34:00 2013 +0200

    window: fix api break on templates from gtk+

 src/dh-window.c |   80 +++++++++++++++++++++++++++---------------------------
 src/dh-window.h |    4 +-
 2 files changed, 42 insertions(+), 42 deletions(-)
---
diff --git a/src/dh-window.c b/src/dh-window.c
index 21eabaa..026d97e 100644
--- a/src/dh-window.c
+++ b/src/dh-window.c
@@ -40,7 +40,7 @@
 
 #define TAB_WIDTH_N_CHARS 15
 
-struct _DhWindowPriv {
+struct _DhWindowPrivate {
         GtkWidget      *hpaned;
         GtkWidget      *sidebar;
         GtkWidget      *notebook;
@@ -145,7 +145,7 @@ static gboolean       do_search                      (DhWindow *window);
 G_DEFINE_TYPE (DhWindow, dh_window, GTK_TYPE_APPLICATION_WINDOW);
 
 #define GET_PRIVATE(instance) G_TYPE_INSTANCE_GET_PRIVATE \
-  (instance, DH_TYPE_WINDOW, DhWindowPriv);
+  (instance, DH_TYPE_WINDOW, DhWindowPrivate);
 
 static void
 new_tab_cb (GSimpleAction *action,
@@ -175,7 +175,7 @@ static void
 window_close_tab (DhWindow *window,
                   gint      page_num)
 {
-        DhWindowPriv *priv;
+        DhWindowPrivate *priv;
         gint          pages;
 
         priv = window->priv;
@@ -211,7 +211,7 @@ copy_cb (GSimpleAction *action,
 {
         DhWindow *window = user_data;
         GtkWidget *widget;
-        DhWindowPriv  *priv;
+        DhWindowPrivate  *priv;
 
         priv = window->priv;
 
@@ -240,7 +240,7 @@ find_cb (GSimpleAction *action,
          gpointer       user_data)
 {
         DhWindow *window = user_data;
-        DhWindowPriv  *priv;
+        DhWindowPrivate  *priv;
 
         priv = window->priv;
 
@@ -383,7 +383,7 @@ go_back_cb (GSimpleAction *action,
             gpointer       user_data)
 {
         DhWindow      *window = user_data;
-        DhWindowPriv  *priv;
+        DhWindowPrivate  *priv;
         WebKitWebView *web_view;
         GtkWidget     *frame;
 
@@ -403,7 +403,7 @@ go_forward_cb (GSimpleAction *action,
                gpointer       user_data)
 {
         DhWindow      *window = user_data;
-        DhWindowPriv  *priv;
+        DhWindowPrivate  *priv;
         WebKitWebView *web_view;
         GtkWidget     *frame;
 
@@ -472,7 +472,7 @@ settings_fonts_changed_cb (DhSettings *settings,
                            gpointer user_data)
 {
         DhWindow *window = DH_WINDOW (user_data);
-        DhWindowPriv *priv = window->priv;
+        DhWindowPrivate *priv = window->priv;
         gint i;
         WebKitWebView *view;
         /* change font for all pages */
@@ -489,7 +489,7 @@ window_configure_event_cb (GtkWidget *window,
                            gpointer user_data)
 {
         DhWindow *dhwindow;
-        DhWindowPriv  *priv;
+        DhWindowPrivate  *priv;
 
         dhwindow = DH_WINDOW (user_data);
         priv = GET_PRIVATE (dhwindow);
@@ -502,7 +502,7 @@ window_configure_event_cb (GtkWidget *window,
 static void
 dh_window_init (DhWindow *window)
 {
-        DhWindowPriv  *priv;
+        DhWindowPrivate  *priv;
         GtkAccelGroup *accel_group;
         GClosure      *closure;
         gint           i;
@@ -584,18 +584,18 @@ dh_window_class_init (DhWindowClass *klass)
         /* Bind class to template */
         gtk_widget_class_set_template_from_resource (widget_class,
                                                      "/org/gnome/devhelp/dh-window.ui");
-        gtk_widget_class_bind_child (widget_class, DhWindowPriv, header_bar);
-        gtk_widget_class_bind_child (widget_class, DhWindowPriv, back_button);
-        gtk_widget_class_bind_child (widget_class, DhWindowPriv, back_button_image);
-        gtk_widget_class_bind_child (widget_class, DhWindowPriv, forward_button);
-        gtk_widget_class_bind_child (widget_class, DhWindowPriv, forward_button_image);
-        gtk_widget_class_bind_child (widget_class, DhWindowPriv, close_button);
-        gtk_widget_class_bind_child (widget_class, DhWindowPriv, hpaned);
-        gtk_widget_class_bind_child (widget_class, DhWindowPriv, grid_sidebar);
-        gtk_widget_class_bind_child (widget_class, DhWindowPriv, grid_documents);
-        gtk_widget_class_bind_child (widget_class, DhWindowPriv, notebook);
-
-        g_type_class_add_private (klass, sizeof (DhWindowPriv));
+        gtk_widget_class_bind_child (widget_class, DhWindow, header_bar);
+        gtk_widget_class_bind_child (widget_class, DhWindow, back_button);
+        gtk_widget_class_bind_child (widget_class, DhWindow, back_button_image);
+        gtk_widget_class_bind_child (widget_class, DhWindow, forward_button);
+        gtk_widget_class_bind_child (widget_class, DhWindow, forward_button_image);
+        gtk_widget_class_bind_child (widget_class, DhWindow, close_button);
+        gtk_widget_class_bind_child (widget_class, DhWindow, hpaned);
+        gtk_widget_class_bind_child (widget_class, DhWindow, grid_sidebar);
+        gtk_widget_class_bind_child (widget_class, DhWindow, grid_documents);
+        gtk_widget_class_bind_child (widget_class, DhWindow, notebook);
+
+        g_type_class_add_private (klass, sizeof (DhWindowPrivate));
 }
 
 static void
@@ -604,7 +604,7 @@ window_web_view_switch_page_cb (GtkNotebook     *notebook,
                                 guint            new_page_num,
                                 DhWindow        *window)
 {
-        DhWindowPriv *priv;
+        DhWindowPrivate *priv;
         GtkWidget    *new_page;
 
         priv = window->priv;
@@ -645,7 +645,7 @@ window_web_view_switch_page_after_cb (GtkNotebook     *notebook,
 static void
 window_populate (DhWindow *window)
 {
-        DhWindowPriv  *priv;
+        DhWindowPrivate  *priv;
         DhBookManager *book_manager;
         const char *prev_icon, *next_icon;
 
@@ -818,7 +818,7 @@ window_web_view_load_changed_cb (WebKitWebView   *web_view,
                                  DhWindow        *window)
 {
         const gchar *uri;
-        DhWindowPriv *priv;
+        DhWindowPrivate *priv;
 
         priv = window->priv;
 
@@ -873,7 +873,7 @@ window_search_link_selected_cb (GObject  *ignored,
                                 DhLink   *link,
                                 DhWindow *window)
 {
-        DhWindowPriv  *priv;
+        DhWindowPrivate  *priv;
         WebKitWebView *view;
         gchar         *uri;
 
@@ -935,7 +935,7 @@ window_web_view_button_press_event_cb (WebKitWebView  *web_view,
 static gboolean
 do_search (DhWindow *window)
 {
-        DhWindowPriv         *priv = window->priv;
+        DhWindowPrivate         *priv = window->priv;
         WebKitFindController *find_controller;
         guint                 find_options = WEBKIT_FIND_OPTIONS_WRAP_AROUND;
         const gchar          *search_text;
@@ -957,7 +957,7 @@ window_find_search_changed_cb (GObject    *object,
                                GParamSpec *pspec,
                                DhWindow   *window)
 {
-        DhWindowPriv *priv = window->priv;
+        DhWindowPrivate *priv = window->priv;
 
         if (priv->find_source_id != 0) {
                 g_source_remove (priv->find_source_id);
@@ -978,7 +978,7 @@ window_find_case_changed_cb (GObject    *object,
 static void
 findbar_find_next (DhWindow *window)
 {
-        DhWindowPriv         *priv = window->priv;
+        DhWindowPrivate         *priv = window->priv;
         WebKitWebView        *view;
         WebKitFindController *find_controller;
 
@@ -1000,7 +1000,7 @@ window_find_next_cb (GtkWidget *widget,
 static void
 findbar_find_previous (DhWindow *window)
 {
-        DhWindowPriv         *priv = window->priv;
+        DhWindowPrivate         *priv = window->priv;
         WebKitWebView        *view;
         WebKitFindController *find_controller;
 
@@ -1023,7 +1023,7 @@ static void
 window_findbar_close_cb (GtkWidget *widget,
                          DhWindow  *window)
 {
-        DhWindowPriv         *priv = window->priv;
+        DhWindowPrivate         *priv = window->priv;
         WebKitWebView        *view;
         WebKitFindController *find_controller;
 
@@ -1052,7 +1052,7 @@ window_web_view_tab_accel_cb (GtkAccelGroup   *accel_group,
                               GdkModifierType  mod,
                               DhWindow        *window)
 {
-        DhWindowPriv *priv;
+        DhWindowPrivate *priv;
         gint          i, num;
 
         priv = window->priv;
@@ -1076,7 +1076,7 @@ window_open_new_tab (DhWindow    *window,
                      const gchar *location,
                      gboolean     switch_focus)
 {
-        DhWindowPriv *priv;
+        DhWindowPrivate *priv;
         GtkWidget    *view;
         GtkWidget    *vbox;
         GtkWidget    *label;
@@ -1227,7 +1227,7 @@ window_new_tab_label (DhWindow        *window,
 static WebKitWebView *
 window_get_active_web_view (DhWindow *window)
 {
-        DhWindowPriv *priv;
+        DhWindowPrivate *priv;
         gint          page_num;
         GtkWidget    *page;
 
@@ -1246,7 +1246,7 @@ window_get_active_web_view (DhWindow *window)
 static GtkWidget *
 window_get_active_info_bar (DhWindow *window)
 {
-        DhWindowPriv *priv;
+        DhWindowPrivate *priv;
         gint          page_num;
         GtkWidget    *page;
 
@@ -1267,7 +1267,7 @@ window_update_title (DhWindow      *window,
                      WebKitWebView *web_view,
                      const gchar   *web_view_title)
 {
-        DhWindowPriv *priv;
+        DhWindowPrivate *priv;
 
         priv = window->priv;
 
@@ -1287,7 +1287,7 @@ window_tab_set_title (DhWindow      *window,
                       WebKitWebView *web_view,
                       const gchar   *title)
 {
-        DhWindowPriv *priv;
+        DhWindowPrivate *priv;
         gint          num_pages, i;
         GtkWidget    *page;
         GtkWidget    *hbox;
@@ -1324,7 +1324,7 @@ GtkWidget *
 dh_window_new (DhApp *application)
 {
         DhWindow     *window;
-        DhWindowPriv *priv;
+        DhWindowPrivate *priv;
 
         window = g_object_new (DH_TYPE_WINDOW, "application", application, NULL);
         priv = window->priv;
@@ -1350,7 +1350,7 @@ void
 dh_window_search (DhWindow    *window,
                   const gchar *str)
 {
-        DhWindowPriv *priv;
+        DhWindowPrivate *priv;
 
         g_return_if_fail (DH_IS_WINDOW (window));
 
@@ -1364,7 +1364,7 @@ void
 _dh_window_display_uri (DhWindow    *window,
                         const gchar *uri)
 {
-        DhWindowPriv  *priv;
+        DhWindowPrivate  *priv;
         WebKitWebView *web_view;
 
         g_return_if_fail (DH_IS_WINDOW (window));
diff --git a/src/dh-window.h b/src/dh-window.h
index 92c7d80..0e07244 100644
--- a/src/dh-window.h
+++ b/src/dh-window.h
@@ -37,7 +37,7 @@ G_BEGIN_DECLS
 
 typedef struct _DhWindow       DhWindow;
 typedef struct _DhWindowClass  DhWindowClass;
-typedef struct _DhWindowPriv   DhWindowPriv;
+typedef struct _DhWindowPrivate DhWindowPrivate;
 
 typedef enum
 {
@@ -47,7 +47,7 @@ typedef enum
 
 struct _DhWindow {
         GtkApplicationWindow parent_instance;
-        DhWindowPriv *priv;
+        DhWindowPrivate *priv;
 };
 
 struct _DhWindowClass {