[nautilus] general: remove convert metadata



commit 87d24047f674ca941e2691602da2501945a82330
Author: Carlos Soriano <csoriano gnome org>
Date:   Wed Dec 16 10:13:41 2015 +0100

    general: remove convert metadata
    
    Major enterprise distributions already moved to gnome 3, and if they
    don't already is unlikely they are going to do an upgrade mechanism on
    their clients from gnome 2 to gnome 3.20.
    
    So remove the conversion of metadata that was done for initial support
    of upgrade from gnome 2 to gnome 3.

 libnautilus-private/Makefile.am      |    4 -
 libnautilus-private/nautilus.convert |   47 -----
 src/Makefile.am                      |    9 -
 src/nautilus-application.c           |   56 ------
 src/nautilus-convert-metadata.c      |  337 ----------------------------------
 5 files changed, 0 insertions(+), 453 deletions(-)
---
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 92c6014..774cd77 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -191,15 +191,11 @@ gsettingsschema_in_files = org.gnome.nautilus.gschema.xml.in
 gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 .PRECIOUS: $(gsettings_SCHEMAS)
 
-convertdir = $(datadir)/GConf/gsettings
-convert_DATA = nautilus.convert
-
 @INTLTOOL_XML_NOMERGE_RULE@
 
 @GSETTINGS_RULES@
 
 EXTRA_DIST =                           \
-       nautilus.convert                \
        $(gsettingsschema_in_files)     \
        $(TRACKER_SOURCES)              \
        nautilus-private-enum-types.h.template  \
diff --git a/src/Makefile.am b/src/Makefile.am
index f631b7f..44f9780 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,10 +5,6 @@ bin_PROGRAMS=                                  \
        nautilus-autorun-software               \
        $(NULL)
 
-libexec_PROGRAMS=                              \
-       nautilus-convert-metadata               \
-       $(NULL)
-
 AM_CPPFLAGS =                                                  \
        -I$(top_srcdir)                                         \
        -I$(top_srcdir)/libnautilus-private                     \
@@ -22,7 +18,6 @@ AM_CPPFLAGS =                                                 \
        $(EXEMPI_CFLAGS)                                        \
        -DDATADIR=\""$(datadir)"\"                              \
        -DLIBDIR=\""$(libdir)"\"                                \
-       -DLIBEXECDIR=\""$(libexecdir)"\"                        \
        -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\"            \
        -DPREFIX=\""$(prefix)"\"                                \
        -DVERSION="\"$(VERSION)\""                              \
@@ -243,10 +238,6 @@ nautilus_autorun_software_SOURCES=                         \
        nautilus-autorun-software.c                     \
        $(NULL)
 
-nautilus_convert_metadata_SOURCES= \
-       nautilus-convert-metadata.c     \
-       $(NULL)
-
 BUILT_SOURCES =                                        \
        $(nautilus_built_sources)                       \
        $(NULL)
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 260d966..cba275c 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -275,60 +275,6 @@ mark_desktop_files_trusted (void)
        g_free (do_once_file);
 }
 
-static void
-do_upgrades_once (NautilusApplication *self)
-{
-       char *metafile_dir, *updated, *nautilus_dir, *xdg_dir;
-       const gchar *message;
-       int fd, res;
-
-       mark_desktop_files_trusted ();
-
-       metafile_dir = g_build_filename (g_get_home_dir (),
-                                        ".nautilus/metafiles", NULL);
-       if (g_file_test (metafile_dir, G_FILE_TEST_IS_DIR)) {
-               updated = g_build_filename (metafile_dir, "migrated-to-gvfs", NULL);
-               if (!g_file_test (updated, G_FILE_TEST_EXISTS)) {
-                       g_spawn_command_line_async (LIBEXECDIR"/nautilus-convert-metadata --quiet", NULL);
-                       fd = g_creat (updated, 0600);
-                       if (fd != -1) {
-                               close (fd);
-                       }
-               }
-               g_free (updated);
-       }
-       g_free (metafile_dir);
-
-       nautilus_dir = g_build_filename (g_get_home_dir (),
-                                        ".nautilus", NULL);
-       xdg_dir = nautilus_get_user_directory ();
-       if (g_file_test (nautilus_dir, G_FILE_TEST_IS_DIR)) {
-               /* test if we already attempted to migrate first */
-               updated = g_build_filename (nautilus_dir, "DEPRECATED-DIRECTORY", NULL);
-               message = _("Nautilus 3.0 deprecated this directory and tried migrating "
-                           "this configuration to ~/.config/nautilus");
-               if (!g_file_test (updated, G_FILE_TEST_EXISTS)) {
-                       /* rename() works fine if the destination directory is
-                        * empty.
-                        */
-                       res = g_rename (nautilus_dir, xdg_dir);
-
-                       if (res == -1) {
-                               fd = g_creat (updated, 0600);
-                               if (fd != -1) {
-                                       res = write (fd, message, strlen (message));
-                                       close (fd);
-                               }
-                       }
-               }
-
-               g_free (updated);
-       }
-
-       g_free (nautilus_dir);
-       g_free (xdg_dir);
-}
-
 NautilusWindow *
 nautilus_application_create_window (NautilusApplication *application,
                                    GdkScreen           *screen)
@@ -1061,8 +1007,6 @@ nautilus_application_startup (GApplication *app)
         */
        check_required_directories (self);
 
-       do_upgrades_once (self);
-
        nautilus_init_application_actions (self);
        init_desktop (self);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]