rygel r295 - trunk/src/media-server

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Tue Nov 25 14:43:23 2008
New Revision: 295
URL: http://svn.gnome.org/viewvc/rygel?rev=295&view=rev

Log:
Remove some unnecessary null-checks.

Thanks to Florian Steinel for pointing it out.

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

Modified: trunk/src/media-server/rygel-media-server-factory.vala
==============================================================================
--- trunk/src/media-server/rygel-media-server-factory.vala	(original)
+++ trunk/src/media-server/rygel-media-server-factory.vala	Tue Nov 25 14:43:23 2008
@@ -144,8 +144,8 @@
         return context;
     }
 
-    private string? get_str_from_gconf (string key,
-                                        string default_value) {
+    private string get_str_from_gconf (string key,
+                                       string default_value) {
         string str;
 
         try {
@@ -227,9 +227,6 @@
 
         string str = get_str_from_gconf (gconf_path + "friendly-name",
                                          plugin_name);
-        if (str == null)
-            return;
-
         element->set_content (str);
 
         /* UDN */
@@ -242,11 +239,7 @@
 
         /* Generate new UUID */
         string default_value = Utils.generate_random_udn ();
-
         str = get_str_from_gconf (gconf_path + "UDN", default_value);
-        if (str == null)
-            return;
-
         element->set_content (str);
     }