[tracker/tracker-0.16] libtracker-common: Small changes to config file logging

[Martyn James Russell <mr src gnome org>]

commit fb4be63cd28305131b45f235a4ff44d4d58d3b67
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Jul 22 09:47:17 2013 +0100

    libtracker-common: Small changes to config file logging

 src/libtracker-common/tracker-config-file.c |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/src/libtracker-common/tracker-config-file.c b/src/libtracker-common/tracker-config-file.c
index 80bcde5..b1135ab 100644
--- a/src/libtracker-common/tracker-config-file.c
+++ b/src/libtracker-common/tracker-config-file.c
@@ -417,8 +417,6 @@ migrate_keyfile_to_settings (TrackerConfigMigrationEntry *entries,
 {
        gint i;
 
-       g_message ("Migrating configuration to GSettings...");
-
        for (i = 0; entries[i].type != G_TYPE_INVALID; i++) {
                if (!g_key_file_has_key (file->key_file,
                                         entries[i].file_section,
@@ -479,8 +477,6 @@ migrate_keyfile_to_settings (TrackerConfigMigrationEntry *entries,
                }
        }
 
-       g_message ("Finished migration to GSettings.");
-
        return TRUE;
 }
 
@@ -572,13 +568,11 @@ tracker_config_file_migrate (TrackerConfigFile           *file,
 {
        g_return_val_if_fail (TRACKER_IS_CONFIG_FILE (file), FALSE);
 
-       if (file->key_file && file->file_exists) {
-               migrate_keyfile_to_settings (entries, file, settings);
-       }
-
-       if (g_getenv ("TRACKER_USE_CONFIG_FILES")) {
+       if (G_UNLIKELY (g_getenv ("TRACKER_USE_CONFIG_FILES"))) {
                UnappliedNotifyData *data;
 
+               g_message ("Using config file, not GSettings");
+
                /* Ensure we have the config file in place */
                if (!file->file_exists) {
                        migrate_settings_to_keyfile (entries,
@@ -598,8 +592,18 @@ tracker_config_file_migrate (TrackerConfigFile           *file,
                                  G_CALLBACK (settings_has_unapplied_notify),
                                  data);
        } else {
-               /* The config file has been migrated to GSettings, delete it */
-               g_file_delete (file->file, NULL, NULL);
+               g_message ("Using GSettings, not config file");
+
+               /* 1. Check if we have a config file */
+               if (file->key_file && file->file_exists) {
+                       /* 2. If so migrate to GSettings */
+                       g_message ("  Migrating settings from config file to GSettings");
+                       migrate_keyfile_to_settings (entries, file, settings);
+
+                       /* 3. Delete the old config file now it's migrated */
+                       g_message ("  Removing old config file");
+                       g_file_delete (file->file, NULL, NULL);
+               }
        }
 
        return TRUE;