[gnome-terminal] server: Run migration before getting the profile list

[Christian Persch <chpe src gnome org>]

commit 26f04c2a8ca5acceaacc1410f3f73f9c8954e211
Author: Christian Persch <chpe gnome org>
Date:   Sun Dec 9 22:23:33 2012 +0100

    server: Run migration before getting the profile list

 src/terminal-app.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/terminal-app.c b/src/terminal-app.c
index 3d62384..998f76c 100644
--- a/src/terminal-app.c
+++ b/src/terminal-app.c
@@ -1189,9 +1189,6 @@ terminal_app_startup (GApplication *application)
   /* Need to set the WM class (bug #685742) */
   gdk_set_program_class("Gnome-terminal");
 
-  /* Check if we need to migrate from gconf to dconf */
-  maybe_migrate_settings (app);
-
   /* Only install the app menu if it's going to be shown */
   g_object_get (gtk_settings_get_for_screen (gdk_screen_get_default ()), "gtk-shell-shows-app-menu", &shell_shows_app_menu, NULL);
   if (!shell_shows_app_menu)
@@ -1228,6 +1225,9 @@ terminal_app_init (TerminalApp *app)
   /* Terminal global settings */
   app->global_settings = g_settings_new (TERMINAL_SETTING_SCHEMA);
 
+  /* Check if we need to migrate from gconf to dconf */
+  maybe_migrate_settings (app);
+
   app->encodings = terminal_encodings_get_builtins ();
   terminal_app_encoding_list_notify_cb (app->global_settings, "encodings", app);
   g_signal_connect (app->global_settings,