[network-manager-applet/danw/libnm-bgo736911: 2/17] migration: drop NM 0.8 -> NM 0.9 migration tool

[Dan Williams <dcbw src gnome org>]

commit bac4091146ed1071357ce9560e2d8621794b8350
Author: Dan Winship <danw redhat com>
Date:   Mon Nov 24 16:46:41 2014 -0500

    migration: drop NM 0.8 -> NM 0.9 migration tool
    
    Anyone upgrading directly from 0.8 to 1.2 will just lose their old
    non-system connections. (Which they probably would have anyway, since
    the migration tool only gets run if nm-applet does...)

 .gitignore                                      |    2 -
 configure.ac                                    |   30 -
 src/Makefile.am                                 |   20 -
 src/applet.c                                    |   18 -
 src/gconf-helpers/Makefile.am                   |   43 -
 src/gconf-helpers/gconf-helpers.c               | 2678 -----------------------
 src/gconf-helpers/gconf-helpers.h               |  253 ---
 src/gconf-helpers/gconf-upgrade.c               | 2365 --------------------
 src/gconf-helpers/gconf-upgrade.h               |   60 -
 src/gconf-helpers/tests/08openvpn-not-saved.xml |  106 -
 src/gconf-helpers/tests/08openvpn-saved.xml     |  106 -
 src/gconf-helpers/tests/08vpnc.xml              |  127 --
 src/gconf-helpers/tests/08wifi.xml              |   96 -
 src/gconf-helpers/tests/Makefile.am             |   33 -
 src/gconf-helpers/tests/fake-gconf.c            |  878 --------
 src/gconf-helpers/tests/fake-gconf.h            |   29 -
 src/gconf-helpers/tests/fake-keyring.c          |  442 ----
 src/gconf-helpers/tests/fake-keyring.h          |   27 -
 src/gconf-helpers/tests/test-import.xml         |  207 --
 src/gconf-helpers/tests/test-upgrade.c          |  528 -----
 src/migration-tool.c                            |   98 -
 21 files changed, 0 insertions(+), 8146 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9e437d1..1977994 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,5 @@ src/libnm-gtk/NMGtk-1.0.typelib
 src/libnm-gtk/tests/test-mobile-providers
 src/marshallers/nma-marshal.*
 src/nm-applet
-src/nm-applet-migration-tool
 src/applet-dbus-bindings.h
-src/gconf-helpers/tests/test-upgrade
 man/*.1
diff --git a/configure.ac b/configure.ac
index 1a48d60..16bd67d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,34 +82,6 @@ PKG_CHECK_MODULES(NMA,
 
 NMA_CFLAGS="$NMA_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
 
-AC_MSG_CHECKING([whether to build nm-applet-migration-tool])
-AC_ARG_ENABLE([migration],
-             [AS_HELP_STRING([--disable-migration], [Don't build migration tool for NM <= 0.8 settings])],
-             [enable_migration="$enableval"],
-             [if test "$UNDER_JHBUILD" = "true"; then
-                  enable_migration=no
-              else
-                  enable_migration=yes
-              fi])
-AC_MSG_RESULT([$enable_migration])
-if test "$enable_migration" = "yes"; then
-       PKG_CHECK_MODULES(MIGRATION, [gconf-2.0 gnome-keyring-1], :,
-                         [AC_MSG_ERROR([
-Could not find devel files needed for nm-applet-migration-tool:
-
-$MIGRATION_PKG_ERRORS
-
-You can configure with --disable-migration if you want to build
-without the code to migrate GConf settings from older (< 0.9)
-nm-applet releases.])])
-
-       AC_SUBST(MIGRATION_CFLAGS)
-       AC_SUBST(MIGRATION_LIBS)
-
-       AC_DEFINE(BUILD_MIGRATION_TOOL, 1, [Define when building nm-applet-migration-tool])
-fi
-AM_CONDITIONAL(BUILD_MIGRATION_TOOL, test "$enable_migration" = "yes")
-
 PKG_CHECK_MODULES(LIBSECRET, [libsecret-unstable])
 AC_SUBST(LIBSECRET_CFLAGS)
 AC_SUBST(LIBSECRET_LIBS)
@@ -206,8 +178,6 @@ src/libnm-gtk/examples/Makefile
 src/libnm-gtk/libnm-gtk.pc
 src/utils/Makefile
 src/utils/tests/Makefile
-src/gconf-helpers/Makefile
-src/gconf-helpers/tests/Makefile
 src/wireless-security/Makefile
 src/connection-editor/Makefile
 src/gnome-bluetooth/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 14ddb99..d66c9d0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -87,26 +87,6 @@ nm_applet_LDADD = \
        ${top_builddir}/src/wireless-security/libwireless-security.la \
        ${top_builddir}/src/libnm-gtk/libnm-gtk.la
 
-if BUILD_MIGRATION_TOOL
-SUBDIRS += gconf-helpers
-
-libexec_PROGRAMS = nm-applet-migration-tool
-endif
-
-nm_applet_migration_tool_CPPFLAGS = \
-       $(nm_applet_CPPFLAGS) \
-       $(MIGRATION_CFLAGS) \
-       -I${top_srcdir}/src/gconf-helpers
-
-nm_applet_migration_tool_SOURCES = \
-       migration-tool.c
-
-nm_applet_migration_tool_LDADD = \
-       $(nm_applet_LDADD) \
-       $(MIGRATION_LIBS) \
-       ${top_builddir}/src/gconf-helpers/libgconf-helpers.la
-
-
 uidir = $(datadir)/nm-applet
 ui_DATA = gsm-unlock.ui info.ui 8021x.ui keyring.png
 
diff --git a/src/applet.c b/src/applet.c
index a7b4ffc..c38c74e 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -3693,24 +3693,6 @@ initable_init (GInitable *initable, GCancellable *cancellable, GError **error)
        }
        applet->settings = nm_remote_settings_new (NULL);
 
-#ifdef BUILD_MIGRATION_TOOL
-       {
-               char *argv[2] = { LIBEXECDIR "/nm-applet-migration-tool", NULL };
-               int status;
-               GError *migrate_error = NULL;
-
-               /* Move user connections to the system */
-               if (!g_spawn_sync (NULL, argv, NULL, 0, NULL, NULL,
-                                  NULL, NULL, &status, &migrate_error)) {
-                       g_warning ("Could not run nm-applet-migration-tool: %s",
-                                  migrate_error->message);
-                       g_error_free (migrate_error);
-               } else if (!WIFEXITED (status) || WEXITSTATUS (status) != 0) {
-                       g_warning ("nm-applet-migration-tool exited with error");
-               }
-       }
-#endif
-
        /* Initialize device classes */
        applet->ethernet_class = applet_device_ethernet_get_class (applet);
        g_assert (applet->ethernet_class);