[tracker/wip/carlosg/fix-ci: 1/3] tracker: Drop dead code in tracker reset --config



commit 22ee92a243b336f80d91f10491104e68ed5972eb
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Nov 6 10:49:50 2018 +0100

    tracker: Drop dead code in tracker reset --config
    
    We haven't used configuration keyfiles for a long long time, just
    stop trying to delete them.

 src/tracker/tracker-reset.c | 65 ---------------------------------------------
 1 file changed, 65 deletions(-)
---
diff --git a/src/tracker/tracker-reset.c b/src/tracker/tracker-reset.c
index 2f4ee250e..576e73880 100644
--- a/src/tracker/tracker-reset.c
+++ b/src/tracker/tracker-reset.c
@@ -90,46 +90,6 @@ log_handler (const gchar    *domain,
        }
 }
 
-static void
-delete_file (GFile    *file,
-             gpointer  user_data)
-{
-       if (g_file_delete (file, NULL, NULL)) {
-               gchar *path;
-
-               path = g_file_get_path (file);
-               g_print ("  %s\n", path);
-               g_free (path);
-       }
-}
-
-static void
-directory_foreach (GFile    *file,
-                   gchar    *suffix,
-                   GFunc     func,
-                   gpointer  user_data)
-{
-       GFileEnumerator *enumerator;
-       GFileInfo *info;
-       GFile *child;
-
-       enumerator = g_file_enumerate_children (file, G_FILE_ATTRIBUTE_STANDARD_NAME,
-                                               G_FILE_QUERY_INFO_NONE, NULL, NULL);
-
-       while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)) != NULL) {
-
-               if (!suffix || g_str_has_suffix (g_file_info_get_name (info), suffix)) {
-                       child = g_file_enumerator_get_child (enumerator, info);
-                       (func) (child, user_data);
-                       g_object_unref (child);
-               }
-
-               g_object_unref (info);
-       }
-
-       g_object_unref (enumerator);
-}
-
 static int
 delete_info_recursively (GFile *file)
 {
@@ -341,33 +301,8 @@ reset_run (void)
        }
 
        if (remove_config) {
-               GFile *file;
-               const gchar *home_conf_dir;
-               gchar *path;
                GSList *all, *l;
 
-               /* Check the default XDG_DATA_HOME location */
-               home_conf_dir = g_getenv ("XDG_CONFIG_HOME");
-
-               if (home_conf_dir && tracker_path_has_write_access_or_was_created (home_conf_dir)) {
-                       path = g_build_path (G_DIR_SEPARATOR_S, home_conf_dir, "tracker", NULL);
-               } else {
-                       home_conf_dir = g_getenv ("HOME");
-
-                       if (!home_conf_dir || !tracker_path_has_write_access_or_was_created (home_conf_dir)) {
-                               home_conf_dir = g_get_home_dir ();
-                       }
-                       path = g_build_path (G_DIR_SEPARATOR_S, home_conf_dir, ".config", "tracker", NULL);
-               }
-
-               file = g_file_new_for_path (path);
-               g_free (path);
-
-               g_print ("%s\n", _("Removing configuration files…"));
-
-               directory_foreach (file, ".cfg", (GFunc) delete_file, NULL);
-               g_object_unref (file);
-
                g_print ("%s\n", _("Resetting existing configuration…"));
 
                all = tracker_gsettings_get_all (NULL);


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