[gnome-terminal] app: Use g_application_get_default

[Christian Persch <chpe src gnome org>]

commit 3512587e860c9fe26900f9fd407978d860c12f19
Author: Christian Persch <chpe gnome org>
Date:   Sun May 13 22:50:59 2012 +0200

    app: Use g_application_get_default

 src/server.c       |    2 +-
 src/terminal-app.c |   24 ------------------------
 src/terminal-app.h |    4 +---
 3 files changed, 2 insertions(+), 28 deletions(-)
---
diff --git a/src/server.c b/src/server.c
index 4ac2011..95069dd 100644
--- a/src/server.c
+++ b/src/server.c
@@ -115,7 +115,7 @@ main (int argc, char **argv)
   exit_code = g_application_run (app, 0, NULL);
 
 out:
-  terminal_app_shutdown ();
+  g_object_unref (app);
 
   return exit_code;
 }
diff --git a/src/terminal-app.c b/src/terminal-app.c
index 4f74ff8..8a1de38 100644
--- a/src/terminal-app.c
+++ b/src/terminal-app.c
@@ -122,8 +122,6 @@ enum
   NUM_COLUMNS
 };
 
-static TerminalApp *global_app = NULL;
-
 static void terminal_app_dconf_get_profile_list (TerminalApp *app);
 
 /* Helper functions */
@@ -1176,8 +1174,6 @@ terminal_app_startup (GApplication *application)
 static void
 terminal_app_init (TerminalApp *app)
 {
-  global_app = app;
-
   gtk_window_set_default_icon_name (GNOME_TERMINAL_ICON_NAME);
 
   /* Desktop proxy settings */
@@ -1254,8 +1250,6 @@ terminal_app_finalize (GObject *object)
   terminal_accels_shutdown ();
 
   G_OBJECT_CLASS (terminal_app_parent_class)->finalize (object);
-
-  global_app = NULL;
 }
 
 static gboolean
@@ -1351,24 +1345,6 @@ terminal_app_new (const char *bus_name)
                        NULL);
 }
 
-TerminalApp*
-terminal_app_get (void)
-{
-  g_assert (global_app != NULL);
-  g_assert (global_app != NULL);
-  return global_app;
-}
-
-void
-terminal_app_shutdown (void)
-{
-  if (global_app == NULL)
-    return;
-
-  g_object_unref (global_app);
-  g_assert (global_app == NULL);
-}
-
 TerminalWindow *
 terminal_app_new_window (TerminalApp *app,
                          GdkScreen *screen)
diff --git a/src/terminal-app.h b/src/terminal-app.h
index a538e1e..95d4dfd 100644
--- a/src/terminal-app.h
+++ b/src/terminal-app.h
@@ -50,9 +50,7 @@ GType terminal_app_get_type (void);
 
 GApplication *terminal_app_new (const char *bus_name);
 
-TerminalApp* terminal_app_get (void);
-
-void terminal_app_shutdown (void);
+#define terminal_app_get (TerminalApp *) g_application_get_default
 
 GDBusObjectManagerServer *terminal_app_get_object_manager (TerminalApp *app);