rygel r69 - in trunk: . src

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Tue Oct 28 20:59:34 2008
New Revision: 69
URL: http://svn.gnome.org/viewvc/rygel?rev=69&view=rev

Log:
Correct the logic in MediaServer.set_friendly_name_and_udn ().

The values for UDN and FriendlyName were not set in the description doc if not
already present in the corresponding gconf keys.

Modified:
   trunk/ChangeLog
   trunk/src/gupnp-media-server.vala

Modified: trunk/src/gupnp-media-server.vala
==============================================================================
--- trunk/src/gupnp-media-server.vala	(original)
+++ trunk/src/gupnp-media-server.vala	Tue Oct 28 20:59:34 2008
@@ -215,8 +215,6 @@
         try {
             str = gconf_client.get_string (key);
         } catch (GLib.Error error) {
-            str = default_value;
-
             try {
                 gconf_client.set_string (key, str);
             } catch (GLib.Error error) {
@@ -228,7 +226,10 @@
             }
         }
 
-        return str;
+        if (str != null)
+                return str;
+        else
+                return default_value;
     }
 
     private static void add_xbox_specifics (Xml.Doc doc) {