[gnome-terminal] migration: Remove this feature

[Egmont Koblinger <egmontkob src gnome org>]

commit 5a32c045fa61fcd65dfbccd45bbd16cd341a6820
Author: Egmont Koblinger <egmont gmail com>
Date:   Wed Mar 21 21:30:45 2018 +0100

    migration: Remove this feature
    
    No longer migrate gconf settings, used by gnome-terminal up to
    version 3.6.x.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=794565
    https://bugzilla.gnome.org/show_bug.cgi?id=792990

 configure.ac            |   25 --
 src/Makefile.am         |   37 ---
 src/migration.c         |  686 -----------------------------------------------
 src/terminal-accels.c   |    2 +-
 src/terminal-app.c      |   60 ----
 src/terminal-nautilus.c |   10 -
 6 files changed, 1 insertions(+), 819 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9970bcb..cf56669 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,30 +116,6 @@ AC_SUBST([dbusservicedir])
 
 GLIB_GSETTINGS
 
-# *************************
-# GConf-GSettings Migration
-# *************************
-
-GCONF_REQUIRED=2.31.3
-
-AC_MSG_CHECKING([whether to build the GConf to GSettings migrator])
-AC_ARG_ENABLE([migration],
-        [AS_HELP_STRING([--disable-migration],[Disable prefs migration from GConf to GSettings])],
-        [],[enable_migration=yes])
-AC_MSG_RESULT([$enable_migration])
-
-if test "$enable_migration" = "yes"; then
- PKG_CHECK_MODULES([MIGRATOR],[
-   gio-2.0 >= $GIO_REQUIRED
-   vte-$VTE_API_VERSION >= $VTE_REQUIRED
-   gconf-2.0 >= $GCONF_REQUIRED
-   dconf >= $DCONF_REQUIRED
-   uuid])
-  AC_DEFINE([ENABLE_MIGRATION],[1],[Define to 1 to enable prefs migration from GConf to GSettings])
-fi
-
-AM_CONDITIONAL([ENABLE_MIGRATION],[test "$enable_migration" = "yes"])
-
 # ***********
 # Build tools
 # ***********
@@ -346,7 +322,6 @@ gnome-terminal-$VERSION:
       DBus interface dir:     ${dbusinterfacedir}
       DBus service dir:       ${dbusservicedir}
       Debug:                  ${enable_debug}
-      Prefs migration:        ${enable_migration}
       Search provider:        ${enable_search_provider}
       Nautilus extension:     ${with_nautilus_extension}
       Nautilus extension dir: ${nautilusextensiondir}
diff --git a/src/Makefile.am b/src/Makefile.am
index 8153331..336208d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -96,7 +96,6 @@ nodist_gnome_terminal_server_SOURCES = $(gnome_terminal_server_built)
 gnome_terminal_server_CPPFLAGS = \
        -DTERMINAL_COMPILATION \
        -DTERM_LOCALEDIR="\"$(datadir)/locale\"" \
-       -DTERM_LIBEXECDIR="\"$(libexecdir)\"" \
        $(AM_CPPFLAGS)
 
 gnome_terminal_server_CFLAGS = \
@@ -285,42 +284,6 @@ libterminal_nautilus_la_LDFLAGS = \
 libterminal_nautilus_la_LIBADD = \
        $(NAUTILUS_LIBS)
 
-# Pref migrator
-
-if ENABLE_MIGRATION
-libexec_PROGRAMS += gnome-terminal-migration
-
-gnome_terminal_migration_SOURCES = \
-       migration.c \
-       terminal-debug.c \
-       terminal-debug.h \
-       terminal-libgsystem.h \
-       terminal-profiles-list.c \
-       terminal-profiles-list.h \
-       terminal-schemas.h \
-       terminal-settings-list.c \
-       terminal-settings-list.h \
-       $(NULL)
-
-nodist_gnome_terminal_migration_SOURCES = \
-       terminal-type-builtins.c \
-       terminal-type-builtins.h \
-       $(NULL)
-
-gnome_terminal_migration_CPPFLAGS = \
-       $(AM_CPPFLAGS)
-gnome_terminal_migration_CFLAGS = \
-       $(MIGRATOR_CFLAGS) \
-       $(WARN_CFLAGS) \
-       $(AM_CFLAGS)
-gnome_terminal_migration_LDFLAGS = \
-       $(AM_LDFLAGS)
-gnome_terminal_migration_LDADD = \
-       $(MIGRATOR_LIBS) \
-       $(INTLLIBS)
-
-endif # ENABLE_MIGRATION
-
 # GNOME Shell search provider
 
 if ENABLE_SEARCH_PROVIDER
diff --git a/src/terminal-accels.c b/src/terminal-accels.c
index bbe3268..a7d9527 100644
--- a/src/terminal-accels.c
+++ b/src/terminal-accels.c
@@ -37,7 +37,7 @@
  * There are two sources of keybindings changes, from GSettings and from
  * the accel map (happens with in-place menu editing).
  *
- * When a keybinding gconf key changes, we propagate that into the
+ * When a keybinding gsettings key changes, we propagate that into the
  * accel map.
  * When the accel map changes, we queue a sync to GSettings.
  *
diff --git a/src/terminal-app.c b/src/terminal-app.c
index f820d2b..4876695 100644
--- a/src/terminal-app.c
+++ b/src/terminal-app.c
@@ -199,63 +199,6 @@ terminal_app_init_debug (void)
 
 /* Helper functions */
 
-static void
-maybe_migrate_settings (TerminalApp *app)
-{
-#ifdef ENABLE_MIGRATION
-  const char * const argv[] = { 
-    TERM_LIBEXECDIR "/gnome-terminal-migration",
-#ifdef ENABLE_DEBUG
-    "--verbose", 
-#endif
-    NULL 
-  };
-  int status;
-  gs_free_error 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) {
-     _terminal_debug_print (TERMINAL_DEBUG_SERVER | TERMINAL_DEBUG_PROFILE,
-                            "Schema version is %u, already migrated.\n", version);
-    return;
-  }
-
-#ifdef ENABLE_MIGRATION
-  /* Only do migration if the settings backend is dconf */
-  GType type = G_OBJECT_TYPE (g_settings_backend_get_default ());
-  if (!g_type_is_a (type, g_type_from_name ("DConfSettingsBackend"))) {
-    _terminal_debug_print (TERMINAL_DEBUG_SERVER | TERMINAL_DEBUG_PROFILE,
-                           "Not migration settings to %s\n", g_type_name (type));
-    goto done;
-  }
-
-  if (!g_spawn_sync (NULL /* our home directory */,
-                     (char **) argv,
-                     NULL /* envv */,
-                     0,
-                     NULL, NULL,
-                     NULL, NULL,
-                     &status,
-                     &error)) {
-    g_printerr ("Failed to migrate settings: %s\n", error->message);
-    return;
-  }
-
-  if (WIFEXITED (status)) {
-    if (WEXITSTATUS (status) != 0)
-      g_printerr ("Profile migrator exited with status %d\n", WEXITSTATUS (status));
-  } else {
-    g_printerr ("Profile migrator exited abnormally.\n");
-  }
-done:
-#endif /* ENABLE_MIGRATION */
-  g_settings_set_uint (terminal_app_get_global_settings (app),
-                       TERMINAL_SETTING_SCHEMA_VERSION,
-                       TERMINAL_SCHEMA_VERSION);
-}
-
 static gboolean
 load_css_from_resource (GApplication *application,
                         GtkCssProvider *provider,
@@ -781,9 +724,6 @@ terminal_app_init (TerminalApp *app)
   if (!gdk_display_supports_selection_notification (display))
     g_printerr ("Display does not support owner-change; copy/paste will be broken!\n");
 
-  /* Check if we need to migrate from gconf to dconf */
-  maybe_migrate_settings (app);
-
   /* Get the profiles */
   app->profiles_list = terminal_profiles_list_new ();
 
diff --git a/src/terminal-nautilus.c b/src/terminal-nautilus.c
index c0c81fc..766f48e 100644
--- a/src/terminal-nautilus.c
+++ b/src/terminal-nautilus.c
@@ -141,22 +141,12 @@ get_terminal_file_info_from_uri (const char *uri)
 static inline gboolean
 desktop_opens_home_dir (TerminalNautilus *nautilus)
 {
-#if 0
-  return  _client_get_bool (gconf_client,
-                                "/apps/nautilus-open-terminal/desktop_opens_home_dir",
-                                NULL);
-#endif
   return TRUE;
 }
 
 static inline gboolean
 display_mc_item (TerminalNautilus *nautilus)
 {
-#if 0
-  return gconf_client_get_bool (gconf_client,
-                                "/apps/nautilus-open-terminal/display_mc_item",
-                                NULL);
-#endif
   return FALSE;
 }