ekiga r6120 - in trunk: lib/gmconf src/endpoints

[jpuydt svn gnome org]

Author: jpuydt
Date: Thu Apr  3 21:35:08 2008
New Revision: 6120
URL: http://svn.gnome.org/viewvc/ekiga?rev=6120&view=rev

Log:
Merge branch 'bugfixing'


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

Modified: trunk/lib/gmconf/gmconf-glib.c
==============================================================================
--- trunk/lib/gmconf/gmconf-glib.c	(original)
+++ trunk/lib/gmconf/gmconf-glib.c	Thu Apr  3 21:35:08 2008
@@ -1338,8 +1338,9 @@
   g_return_val_if_fail (key != NULL, FALSE);
 
   entry = database_get_entry_for_key (db, key);
-  if (entry == NULL)
-    return FALSE;
+
+  g_return_val_if_fail (entry != NULL, FALSE);
+
   return entry_get_bool (entry);
 }
 
@@ -1368,8 +1369,9 @@
   g_return_val_if_fail (key != NULL, 0);
 
   entry = database_get_entry_for_key (db, key);
-  if (entry == NULL)
-    return 0;
+
+  g_return_val_if_fail (entry != NULL, 0);
+
   return entry_get_int (entry);
 }
 
@@ -1398,8 +1400,8 @@
   g_return_val_if_fail (key != NULL, 0);
 
   entry = database_get_entry_for_key (db, key);
-  if (entry == NULL)
-    return 0;
+
+  g_return_val_if_fail (entry != NULL, 0);
 
   return entry_get_float (entry);
 }
@@ -1429,8 +1431,9 @@
   g_return_val_if_fail (key != NULL, NULL);
 
   entry = database_get_entry_for_key (db, key);
-  if (entry == NULL)
-    return NULL;
+
+  g_return_val_if_fail (entry != NULL, NULL);
+
   return g_strdup (entry_get_string (entry));
 }
 
@@ -1459,8 +1462,9 @@
   g_return_val_if_fail (key != NULL, NULL);
 
   entry = database_get_entry_for_key (db, key);
-  if (entry == NULL)
-    return NULL;
+
+  g_return_val_if_fail (entry != NULL, NULL);
+
   return string_list_deep_copy (entry_get_list (entry));
 }
 

Modified: trunk/src/endpoints/opal-gmconf-bridge.cpp
==============================================================================
--- trunk/src/endpoints/opal-gmconf-bridge.cpp	(original)
+++ trunk/src/endpoints/opal-gmconf-bridge.cpp	Thu Apr  3 21:35:08 2008
@@ -190,9 +190,7 @@
     codecs.append (v_codecs);
     manager.set_codecs (codecs);
 
-    g_slist_foreach (audio_codecs, (GFunc) g_free, NULL);
     g_slist_free (audio_codecs);
-    g_slist_foreach (video_codecs, (GFunc) g_free, NULL);
     g_slist_free (video_codecs);
 
     // Update the GmConf keys, in case we would have missed some codecs or