[devhelp] Window: move class_init() before init()



commit c32c8e3f2a3c66aeae654cb3e5193583c3e77c99
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Feb 1 21:17:29 2018 +0100

    Window: move class_init() before init()
    
    class_init() is called before init(), so it's more logical to have the
    class_init code above.

 src/dh-window.c |   74 +++++++++++++++++++++++++++---------------------------
 1 files changed, 37 insertions(+), 37 deletions(-)
---
diff --git a/src/dh-window.c b/src/dh-window.c
index d71b362..7e3e094 100644
--- a/src/dh-window.c
+++ b/src/dh-window.c
@@ -122,6 +122,43 @@ static void           do_search                      (DhWindow *window);
 
 G_DEFINE_TYPE_WITH_PRIVATE (DhWindow, dh_window, GTK_TYPE_APPLICATION_WINDOW);
 
+static gboolean
+dh_window_delete_event (GtkWidget   *widget,
+                        GdkEventAny *event)
+{
+        DhSettings *settings;
+
+        settings = dh_settings_get_singleton ();
+        dh_util_window_settings_save (GTK_WINDOW (widget),
+                                      dh_settings_peek_window_settings (settings));
+
+        if (GTK_WIDGET_CLASS (dh_window_parent_class)->delete_event == NULL)
+                return GDK_EVENT_PROPAGATE;
+
+        return GTK_WIDGET_CLASS (dh_window_parent_class)->delete_event (widget, event);
+}
+
+static void
+dh_window_class_init (DhWindowClass *klass)
+{
+        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+        widget_class->delete_event = dh_window_delete_event;
+
+        /* Bind class to template */
+        gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/devhelp/dh-window.ui");
+        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, header_bar);
+        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, window_menu_button);
+        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, window_menu_plus_app_menu);
+        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, hpaned);
+        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, grid_sidebar);
+        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, search_bar);
+        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, search_entry);
+        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, search_prev_button);
+        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, search_next_button);
+        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, notebook);
+}
+
 static WebKitWebView *
 window_get_active_web_view (DhWindow *window)
 {
@@ -523,22 +560,6 @@ settings_fonts_changed_cb (DhSettings  *settings,
         }
 }
 
-static gboolean
-dh_window_delete_event (GtkWidget   *widget,
-                        GdkEventAny *event)
-{
-        DhSettings *settings;
-
-        settings = dh_settings_get_singleton ();
-        dh_util_window_settings_save (GTK_WINDOW (widget),
-                                      dh_settings_peek_window_settings (settings));
-
-        if (GTK_WIDGET_CLASS (dh_window_parent_class)->delete_event == NULL)
-                return GDK_EVENT_PROPAGATE;
-
-        return GTK_WIDGET_CLASS (dh_window_parent_class)->delete_event (widget, event);
-}
-
 static void
 dh_window_init (DhWindow *window)
 {
@@ -585,27 +606,6 @@ dh_window_init (DhWindow *window)
 }
 
 static void
-dh_window_class_init (DhWindowClass *klass)
-{
-        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-        widget_class->delete_event = dh_window_delete_event;
-
-        /* Bind class to template */
-        gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/devhelp/dh-window.ui");
-        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, header_bar);
-        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, window_menu_button);
-        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, window_menu_plus_app_menu);
-        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, hpaned);
-        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, grid_sidebar);
-        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, search_bar);
-        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, search_entry);
-        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, search_prev_button);
-        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, search_next_button);
-        gtk_widget_class_bind_template_child_private (widget_class, DhWindow, notebook);
-}
-
-static void
 window_web_view_switch_page_cb (GtkNotebook *notebook,
                                 gpointer     page,
                                 guint        new_page_num,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]