ekiga r6124 - trunk/src/endpoints

[jpuydt svn gnome org]

Author: jpuydt
Date: Sat Apr  5 10:09:02 2008
New Revision: 6124
URL: http://svn.gnome.org/viewvc/ekiga?rev=6124&view=rev

Log:
One can't initialize std::string with NULL!


Modified:
   trunk/src/endpoints/opal-gmconf-bridge.cpp

Modified: trunk/src/endpoints/opal-gmconf-bridge.cpp
==============================================================================
--- trunk/src/endpoints/opal-gmconf-bridge.cpp	(original)
+++ trunk/src/endpoints/opal-gmconf-bridge.cpp	Sat Apr  5 10:09:02 2008
@@ -217,7 +217,9 @@
   // 
   else if (key == SIP_KEY "outbound_proxy_host") {
 
-    manager.GetSIPEndpoint ()->set_outbound_proxy (gm_conf_entry_get_string (entry));
+    const gchar *str = gm_conf_entry_get_string (entry);
+    if (str != NULL)
+      manager.GetSIPEndpoint ()->set_outbound_proxy (str);
   }
   else if (key == SIP_KEY "dtmf_mode") {
 
@@ -225,7 +227,9 @@
   }
   else if (key == SIP_KEY "forward_host") {
 
-    manager.GetSIPEndpoint ()->set_forward_host (gm_conf_entry_get_string (entry));
+    const gchar *str = gm_conf_entry_get_string (entry);
+    if (str != NULL)    
+      manager.GetSIPEndpoint ()->set_forward_host (str);
   }
 
   //
@@ -241,7 +245,9 @@
   //
   else if (key == PERSONAL_DATA_KEY "full_name") {
 
-    manager.set_fullname (gm_conf_entry_get_string (entry));
+    const gchar *str = gm_conf_entry_get_string (entry);
+    if (str != NULL)    
+      manager.set_fullname (str);
   }