ekiga r7457 - in trunk: . lib/gmconf

[dsandras svn gnome org]

Author: dsandras
Date: Thu Dec 11 20:31:54 2008
New Revision: 7457
URL: http://svn.gnome.org/viewvc/ekiga?rev=7457&view=rev

Log:
Allow NULL entry->value.


Modified:
   trunk/ChangeLog
   trunk/lib/gmconf/gmconf-gconf.c

Modified: trunk/lib/gmconf/gmconf-gconf.c
==============================================================================
--- trunk/lib/gmconf/gmconf-gconf.c	(original)
+++ trunk/lib/gmconf/gmconf-gconf.c	Thu Dec 11 20:31:54 2008
@@ -315,7 +315,10 @@
   g_return_val_if_fail (entry != NULL, FALSE);
 
   gconf_entry = (GConfEntry *)entry;
-  return gconf_value_get_bool (gconf_entry->value);
+  if (gconf_entry->value)
+    return gconf_value_get_bool (gconf_entry->value);
+
+  return FALSE;
 }
 
 
@@ -327,7 +330,10 @@
   g_return_val_if_fail (entry != NULL, 0);
 
   gconf_entry = (GConfEntry *)entry;
-  return gconf_value_get_int (gconf_entry->value);
+  if (gconf_entry->value)
+    return gconf_value_get_int (gconf_entry->value);
+
+  return 0;
 }
 
 
@@ -339,7 +345,10 @@
   g_return_val_if_fail (entry != NULL, NULL);
 
   gconf_entry = (GConfEntry *)entry;
-  return gconf_value_get_string (gconf_entry->value);
+  if (gconf_entry->value)
+    return gconf_value_get_string (gconf_entry->value);
+
+  return NULL;
 }
 
 
@@ -354,7 +363,8 @@
 
   gconf_entry = (GConfEntry *)entry;
 
-  it = gconf_value_get_list (gconf_entry->value);
+  if (gconf_entry->value)
+    it = gconf_value_get_list (gconf_entry->value);
   while (it) {
 
     list = g_slist_append (list, g_strdup ((char *) gconf_value_get_string (it->data)));