rygel r323 - trunk/src/rygel

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Mon Dec  1 16:39:22 2008
New Revision: 323
URL: http://svn.gnome.org/viewvc/rygel?rev=323&view=rev

Log:
GConf.Client.get_string returns null if key is not found.

GConf.Client.get_string returns null if key is not found rather than
throwing an error.

Modified:
   trunk/src/rygel/rygel-media-server-factory.vala

Modified: trunk/src/rygel/rygel-media-server-factory.vala
==============================================================================
--- trunk/src/rygel/rygel-media-server-factory.vala	(original)
+++ trunk/src/rygel/rygel-media-server-factory.vala	Mon Dec  1 16:39:22 2008
@@ -145,21 +145,28 @@
         try {
             str = this.gconf.get_string (key);
         } catch (GLib.Error error) {
+            warning ("Error getting gconf key '%s': %s." +
+                     " Assuming default value '%s'.",
+                     key,
+                     error.message,
+                     default_value);
+
+            str = default_value;
+        }
+
+        if (str == null) {
+            str = default_value;
+
             try {
                 this.gconf.set_string (key, default_value);
             } catch (GLib.Error error) {
                 warning ("Error setting gconf key '%s': %s.",
                         key,
                         error.message);
-
-                str = null;
             }
         }
 
-        if (str != null)
-                return str;
-        else
-                return default_value;
+        return str;
     }
 
     private void add_xbox_specifics (Xml.Doc doc) {