[gnome-control-center] [common] don't unref NULL GConf entries

[Jens Granseuer <jensg src gnome org>]

commit 45f198113a1807faf094e3529b03da7622acc3ed
Author: Jens Granseuer <jensgr gmx net>
Date:   Wed May 20 23:20:04 2009 +0200

    [common] don't unref NULL GConf entries
---
 capplets/common/ChangeLog               |    5 +++++
 capplets/common/gconf-property-editor.c |    3 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index 2c6b6be..e47e296 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-20  Jens Granseuer  <jensgr gmx net>
+
+	* gconf-property-editor.c (gconf_peditor_new): don't unref the GConf
+	entry if it is NULL (bug #583117)
+
 2009-05-03  Jens Granseuer  <jensgr gmx net>
 
 	Patch by: <yselkowitz users sourceforge net>
diff --git a/capplets/common/gconf-property-editor.c b/capplets/common/gconf-property-editor.c
index 518fd9f..31f9e0e 100644
--- a/capplets/common/gconf-property-editor.c
+++ b/capplets/common/gconf-property-editor.c
@@ -351,7 +351,8 @@ gconf_peditor_new (const gchar           *key,
 	gconf_entry = gconf_client_get_entry (client, GCONF_PROPERTY_EDITOR (obj)->p->key, NULL, TRUE, NULL);
 	GCONF_PROPERTY_EDITOR (obj)->p->callback (client, 0, gconf_entry, obj);
 	GCONF_PROPERTY_EDITOR (obj)->p->inited = TRUE;
-	gconf_entry_free (gconf_entry);
+	if (gconf_entry)
+		gconf_entry_free (gconf_entry);
 	g_object_unref (client);
 
 	return obj;