[gnome-builder/wip/open-file: 4/4] application: lots of cleanup for maintainability.

[Christian Hergert <chergert src gnome org>]

commit 3eb58ca350cc73012366fc1eb252a65e9af9b019
Author: Christian Hergert <christian hergert me>
Date:   Tue Sep 23 17:15:46 2014 -0700

    application: lots of cleanup for maintainability.

 src/app/gb-application.c              |  118 +++++++++++++++++++--------------
 src/resources/keybindings/default.ini |    3 +
 2 files changed, 72 insertions(+), 49 deletions(-)
---
diff --git a/src/app/gb-application.c b/src/app/gb-application.c
index 3781023..876738c 100644
--- a/src/app/gb-application.c
+++ b/src/app/gb-application.c
@@ -41,7 +41,9 @@ gb_application_new (void)
 }
 
 static void
-theme_changed (GtkSettings *settings)
+gb_application_on_theme_changed (GbApplication *self,
+                                 GParamSpec    *pspec,
+                                 GtkSettings   *settings)
 {
   static GtkCssProvider *provider = NULL;
   GdkScreen *screen;
@@ -49,6 +51,9 @@ theme_changed (GtkSettings *settings)
 
   ENTRY;
 
+  g_assert (GB_IS_APPLICATION (self));
+  g_assert (GTK_IS_SETTINGS (settings));
+
   g_object_get (settings, "gtk-theme-name", &theme, NULL);
   screen = gdk_screen_get_default ();
 
@@ -81,7 +86,7 @@ theme_changed (GtkSettings *settings)
 }
 
 static void
-setup_theme_extensions (void)
+gb_application_register_theme_overrides (GbApplication *application)
 {
   GtkSettings *settings;
 
@@ -92,17 +97,18 @@ setup_theme_extensions (void)
    * for a more automatic solution that is still under discussion.
    */
   settings = gtk_settings_get_default ();
-  g_signal_connect (settings,
-                    "notify::gtk-theme-name",
-                    G_CALLBACK (theme_changed),
-                    NULL);
-  theme_changed (settings);
+  g_signal_connect_object (settings,
+                           "notify::gtk-theme-name",
+                           G_CALLBACK (gb_application_on_theme_changed),
+                           application,
+                           G_CONNECT_SWAPPED);
+  gb_application_on_theme_changed (application, NULL, settings);
 
   EXIT;
 }
 
 static void
-setup_keybindings (GbApplication *application)
+gb_application_register_keybindings (GbApplication *self)
 {
   GbKeybindings *keybindings;
   GError *error = NULL;
@@ -111,7 +117,7 @@ setup_keybindings (GbApplication *application)
 
   ENTRY;
 
-  g_assert (GB_IS_APPLICATION (application));
+  g_assert (GB_IS_APPLICATION (self));
 
   keybindings = gb_keybindings_new ();
 
@@ -142,7 +148,7 @@ setup_keybindings (GbApplication *application)
     }
   g_free (path);
 
-  gb_keybindings_register (keybindings, GTK_APPLICATION (application));
+  gb_keybindings_register (keybindings, GTK_APPLICATION (self));
 
   g_object_unref (keybindings);
 
@@ -201,11 +207,9 @@ gb_application_open (GApplication   *application,
   GbWorkbench *workbench = NULL;
   GbWorkspace *workspace;
   GList *list;
+  guint i;
 
-  /*
-   * TODO: We should plumb this through so we are executing an action
-   *       with a "filename" parameter.
-   */
+  g_assert (GB_IS_APPLICATION (application));
 
   list = gtk_application_get_windows (GTK_APPLICATION (application));
 
@@ -224,41 +228,29 @@ gb_application_open (GApplication   *application,
   workspace = gb_workbench_get_workspace (workbench,
                                           GB_TYPE_EDITOR_WORKSPACE);
 
-  if (workspace)
-  {
-    guint i;
+  g_assert (GB_IS_EDITOR_WORKSPACE (workspace));
 
-    for (i = 0; i < n_files; i++)
+  for (i = 0; i < n_files; i++)
+    {
+      g_return_if_fail (G_IS_FILE (files [i]));
       gb_editor_workspace_open (GB_EDITOR_WORKSPACE (workspace), files [i]);
-  }
+    }
 }
 
 static void
-gb_application_startup (GApplication *app)
+gb_application_activate_quit_action (GSimpleAction *action,
+                                     GVariant      *parameter,
+                                     gpointer       user_data)
 {
-  ENTRY;
-
-  G_APPLICATION_CLASS (gb_application_parent_class)->startup (app);
-
-  g_resources_register (gb_get_resource ());
-  setup_theme_extensions ();
-  setup_keybindings (GB_APPLICATION (app));
-
-  EXIT;
-}
+  g_return_if_fail (GB_IS_APPLICATION (user_data));
 
-static void
-on_quit_activate (GSimpleAction *action,
-                  GVariant      *parameter,
-                  gpointer       user_data)
-{
-  g_application_quit (g_application_get_default ());
+  g_application_quit (G_APPLICATION (user_data));
 }
 
 static void
-on_about_activate (GSimpleAction *action,
-                   GVariant      *parameter,
-                   gpointer       user_data)
+gb_application_activate_about_action (GSimpleAction *action,
+                                      GVariant      *parameter,
+                                      gpointer       user_data)
 {
   GtkWindow *window;
   GList *list;
@@ -267,6 +259,8 @@ on_about_activate (GSimpleAction *action,
   gchar **artists;
   gchar *translators;
 
+  g_return_if_fail (GB_IS_APPLICATION (user_data));
+
   list = gtk_application_get_windows (GTK_APPLICATION (user_data));
 
   bytes = g_resources_lookup_data ("/org/gnome/builder/AUTHORS", 0, NULL);
@@ -306,27 +300,53 @@ on_about_activate (GSimpleAction *action,
 }
 
 static void
-gb_application_constructed (GObject *object)
+gb_application_register_actions (GbApplication *self)
 {
   static const GActionEntry action_entries[] = {
-    { "quit", on_quit_activate },
-    { "about", on_about_activate },
+    { "about", gb_application_activate_about_action },
+    { "quit", gb_application_activate_quit_action },
   };
 
-  static const gchar *quit_accels[] = { "<Control>q", NULL };
+  g_return_if_fail (GB_IS_APPLICATION (self));
+
+  g_action_map_add_action_entries (G_ACTION_MAP (self),
+                                   action_entries,
+                                   G_N_ELEMENTS (action_entries),
+                                   self);
+}
+
+static void
+gb_application_startup (GApplication *app)
+{
+  GbApplication *self;
+
+  ENTRY;
+
+  self = GB_APPLICATION (app);
+
+  g_resources_register (gb_get_resource ());
+
+  G_APPLICATION_CLASS (gb_application_parent_class)->startup (app);
+
+  gb_application_register_actions (self);
+  gb_application_register_keybindings (self);
+  gb_application_register_theme_overrides (self);
+
+  EXIT;
+}
+
+static void
+gb_application_constructed (GObject *object)
+{
+  ENTRY;
 
   if (G_OBJECT_CLASS (gb_application_parent_class)->constructed)
     G_OBJECT_CLASS (gb_application_parent_class)->constructed (object);
 
-  g_action_map_add_action_entries (G_ACTION_MAP (object),
-                                   action_entries,
-                                   G_N_ELEMENTS (action_entries),
-                                   object);
   g_application_set_resource_base_path (G_APPLICATION (object),
                                         "/org/gnome/builder");
 
-  gtk_application_set_accels_for_action (GTK_APPLICATION (object),
-                                         "app.quit", quit_accels);
+  EXIT;
 }
 
 static void
diff --git a/src/resources/keybindings/default.ini b/src/resources/keybindings/default.ini
index 0893e6e..9120e66 100644
--- a/src/resources/keybindings/default.ini
+++ b/src/resources/keybindings/default.ini
@@ -1,3 +1,6 @@
+[app]
+quit = <Control>q
+
 [win]
 workspace1 = <Control>1
 workspace2 = <Control>2