[gnome-builder] app: a bit more cleanup of gb-application.



commit be0ae093f391e87d6cdd436c05257fcbac8df41b
Author: Christian Hergert <christian hergert me>
Date:   Tue Sep 23 17:39:52 2014 -0700

    app: a bit more cleanup of gb-application.
    
     - Remove gb_application_new since we can just use g_object_new with the
       parameters we care about.
     - Cleanup function names to have a prefix. Makes debugging more obvious.

 src/app/gb-application.c |   16 +++++-----------
 src/app/gb-application.h |    3 +--
 2 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/src/app/gb-application.c b/src/app/gb-application.c
index 1fe21f8..1f74d53 100644
--- a/src/app/gb-application.c
+++ b/src/app/gb-application.c
@@ -34,12 +34,6 @@
 
 G_DEFINE_TYPE (GbApplication, gb_application, GTK_TYPE_APPLICATION)
 
-GbApplication *
-gb_application_new (void)
-{
-  return g_object_new (GB_TYPE_APPLICATION, NULL);
-}
-
 static void
 gb_application_on_theme_changed (GbApplication *self,
                                  GParamSpec    *pspec,
@@ -155,8 +149,8 @@ gb_application_register_keybindings (GbApplication *self)
   EXIT;
 }
 
-static GtkWindow *
-create_window (GApplication *application)
+static GbWorkbench *
+gb_application_create_workbench (GApplication *application)
 {
   GtkWindow *window;
   GdkScreen *screen;
@@ -189,13 +183,13 @@ create_window (GApplication *application)
 
   gtk_application_add_window (GTK_APPLICATION (application), window);
 
-  RETURN (window);
+  RETURN (GB_WORKBENCH (window));
 }
 
 static void
 gb_application_activate (GApplication *application)
 {
-  create_window (application);
+  (void)gb_application_create_workbench (application);
 }
 
 static void
@@ -223,7 +217,7 @@ gb_application_open (GApplication   *application,
     }
 
   if (!workbench)
-    workbench = GB_WORKBENCH (create_window (application));
+    workbench = GB_WORKBENCH (gb_application_create_workbench (application));
 
   workspace = gb_workbench_get_workspace (workbench,
                                           GB_TYPE_EDITOR_WORKSPACE);
diff --git a/src/app/gb-application.h b/src/app/gb-application.h
index 0eba00d..16dd7bf 100644
--- a/src/app/gb-application.h
+++ b/src/app/gb-application.h
@@ -48,8 +48,7 @@ struct _GbApplicationClass
   GtkApplicationClass parent_class;
 };
 
-GbApplication *gb_application_new      (void);
-GType          gb_application_get_type (void) G_GNUC_CONST;
+GType gb_application_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 


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