ekiga r6248 - in trunk: . lib/gmconf

[jpuydt svn gnome org]

Author: jpuydt
Date: Wed May  7 16:26:57 2008
New Revision: 6248
URL: http://svn.gnome.org/viewvc/ekiga?rev=6248&view=rev

Log:
Fixed runtime warnings


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

Modified: trunk/lib/gmconf/gmconf-glib.c
==============================================================================
--- trunk/lib/gmconf/gmconf-glib.c	(original)
+++ trunk/lib/gmconf/gmconf-glib.c	Wed May  7 16:26:57 2008
@@ -949,6 +949,7 @@
   GmConfEntry *entry = NULL;
   GIOChannel *io = NULL;
   gchar *value = NULL;
+  const gchar *txt = NULL;
 
   g_return_if_fail (data != NULL);
   g_return_if_fail (user_data != NULL);
@@ -1002,7 +1003,11 @@
     value = string_from_float (entry_get_float (entry));
     break;
   case GM_CONF_STRING:
-    value = g_markup_escape_text (entry_get_string (entry), -1);
+    txt = entry_get_string (entry);
+    if (txt != NULL)
+      value = g_markup_escape_text (txt, -1);
+    else
+      value = g_strdup ("");
     break;
   case GM_CONF_LIST:
     value = string_from_list (entry_get_list (entry));