[gnome-terminal] server: Move setting WM class to application startup

[Christian Persch <chpe src gnome org>]

commit 3370c0e51159f5be476b909e94ac05e5362dd28a
Author: Christian Persch <chpe gnome org>
Date:   Thu Oct 11 20:59:16 2012 +0200

    server: Move setting WM class to application startup

 src/server.c       |    3 ---
 src/terminal-app.c |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/server.c b/src/server.c
index d9e1811..baf65ec 100644
--- a/src/server.c
+++ b/src/server.c
@@ -97,9 +97,6 @@ main (int argc, char **argv)
     exit (EXIT_FAILURE);
   }
 
-  /* Need to set the WM class (bug #685742) */
-  gdk_set_program_class("Gnome-terminal");
-
   app = terminal_app_new (app_id);
   g_free (app_id);
 
diff --git a/src/terminal-app.c b/src/terminal-app.c
index 46742df..cd3b575 100644
--- a/src/terminal-app.c
+++ b/src/terminal-app.c
@@ -1147,6 +1147,9 @@ terminal_app_startup (GApplication *application)
 
   G_APPLICATION_CLASS (terminal_app_parent_class)->startup (application);
 
+  /* Need to set the WM class (bug #685742) */
+  gdk_set_program_class("Gnome-terminal");
+
   /* FIXME: Is this the right place to do prefs migration from gconf->dconf? */
 
   g_object_get (gtk_settings_get_for_screen (gdk_screen_get_default ()), "gtk-shell-shows-app-menu", &shell_shows_app_menu, NULL);