From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 28 Oct 2013 00:26:33 +0000 (-0700)
Subject: GKeyFileSettingsBackend: ignore file deletions
X-Git-Tag: 2.39.1~133
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1fba61981a80c7a536113ba55f5a6acee8cd230c;p=platform%2Fupstream%2Fglib.git

GKeyFileSettingsBackend: ignore file deletions

Ignore the keyfile being deleted (ie: by the user) instead of reporting
it to the application as all values being reverted back to their
originals.

https://bugzilla.gnome.org/show_bug.cgi?id=637956
---

diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c
index 6601eba..6f97da4 100644
--- a/gio/gkeyfilesettingsbackend.c
+++ b/gio/gkeyfilesettingsbackend.c
@@ -550,7 +550,9 @@ file_changed (GFileMonitor      *monitor,
 {
   GKeyfileSettingsBackend *kfsb = user_data;
 
-  g_keyfile_settings_backend_keyfile_reload (kfsb);
+  /* Ignore file deletions, let the GKeyFile content remain in tact. */
+  if (event_type != G_FILE_MONITOR_EVENT_DELETED)
+    g_keyfile_settings_backend_keyfile_reload (kfsb);
 }
 
 static void