[gnome-terminal/gnome-3-8] migration: When disabled, don't write to gsettings on each startup (cherry picked from commit ac2ef4

[Christian Persch <chpe src gnome org>]

commit 20e05e9cfb608b92cbfaaf10effd9edca7386aa7
Author: Christian Persch <chpe gnome org>
Date:   Wed Jun 12 18:28:00 2013 +0200

    migration: When disabled, don't write to gsettings on each startup
    (cherry picked from commit ac2ef407d801829b5eaae28d0a4ecb3c62f46c1a)

 src/terminal-app.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/src/terminal-app.c b/src/terminal-app.c
index 3b27f16..54a4ccd 100644
--- a/src/terminal-app.c
+++ b/src/terminal-app.c
@@ -102,9 +102,10 @@ maybe_migrate_settings (TerminalApp *app)
 #endif
     NULL 
   };
-  guint version;
   int status;
   GError *error = NULL;
+#endif /* ENABLE_MIGRATION */
+  guint version;
 
   version = g_settings_get_uint (terminal_app_get_global_settings (app), TERMINAL_SETTING_SCHEMA_VERSION);
   if (version >= TERMINAL_SCHEMA_VERSION) {
@@ -113,6 +114,7 @@ maybe_migrate_settings (TerminalApp *app)
     return;
   }
 
+#ifdef ENABLE_MIGRATION
   if (!g_spawn_sync (NULL /* our home directory */,
                      (char **) argv,
                      NULL /* envv */,