telepathy-mission-control: mcd_storage_set_value: unset keys directly instead of via set_string

Simon McVittie smcv at kemper.freedesktop.org
Thu Oct 4 08:19:46 PDT 2012


Module: telepathy-mission-control
Branch: master
Commit: ed5ec4105052e5e86f7471855a5c234822fc1c74
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=ed5ec4105052e5e86f7471855a5c234822fc1c74

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Sep  5 10:03:37 2012 +0100

mcd_storage_set_value: unset keys directly instead of via set_string

---

 src/mcd-storage.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/mcd-storage.c b/src/mcd-storage.c
index 4b199d0..8631273 100644
--- a/src/mcd-storage.c
+++ b/src/mcd-storage.c
@@ -859,7 +859,16 @@ mcd_storage_set_value (McdStorage *self,
 
   if (value == NULL)
     {
-      return mcd_storage_set_string (self, name, key, NULL, secret);
+      gchar *old = g_key_file_get_value (self->keyfile, name, key, NULL);
+      gboolean updated = (old != NULL);
+
+      g_free (old);
+      g_key_file_remove_key (self->keyfile, name, key, NULL);
+
+      if (updated)
+        update_storage (self, name, key, secret);
+
+      return updated;
     }
   else
     {



More information about the telepathy-commits mailing list