Patch from Tobias Mueller <tobiasmue@svn.gnome.org>: ** Fix for bug #545022 (Free...

svn path=/trunk/; revision=9252

diff --git a/ChangeLog b/ChangeLog
index 167c651..e2b3202 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-04  Tobias Mueller  <tobiasmue@svn.gnome.org>
+
+       ** Fix for bug #545022
+
+       * libedataserver/e-account.c (ea_setting_setup): Free gconf-entry only
+       if it is non-NULL. 
+
 2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
 
        ** Fixes part of bug #545558

diff --git a/libedataserver/e-account.c b/libedataserver/e-account.c
index 6b04b46..1fcc005 100644 (file)
--- a/libedataserver/e-account.c
+++ b/libedataserver/e-account.c
@@ -868,9 +868,10 @@ ea_setting_setup(void)
                g_hash_table_insert(ea_system_table, (char *)system_perms[i].key, &system_perms[i]);
                sprintf(key, LOCK_BASE "/%s", system_perms[i].key);
                entry = gconf_client_get_entry(gconf, key, NULL, TRUE, &err);
-               if (entry)
+               if (entry) {
                        ea_setting_notify(gconf, 0, entry, NULL);
-               gconf_entry_free(entry);
+                       gconf_entry_free(entry);
+               }
        }
 
        if (err) {