[rygel] data,core: Don't put empty nodes in device description

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 4a990df0e4a7ecc8110295e1f843a3a0fdc31771
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Mon Sep 13 14:56:44 2010 +0300

    data,core: Don't put empty nodes in device description

 data/xml/MediaRenderer2.xml              |    1 -
 data/xml/MediaServer2.xml                |    3 ---
 src/rygel/rygel-root-device-factory.vala |   19 +++----------------
 3 files changed, 3 insertions(+), 20 deletions(-)
---
diff --git a/data/xml/MediaRenderer2.xml b/data/xml/MediaRenderer2.xml
index ea8f665..f363be5 100644
--- a/data/xml/MediaRenderer2.xml
+++ b/data/xml/MediaRenderer2.xml
@@ -11,7 +11,6 @@
     <manufacturerURL>http://live.gnome.org/Rygel</manufacturerURL>
     <modelName>Rygel</modelName>
     <modelNumber>0.1</modelNumber>
-    <modelDescription></modelDescription>
     <modelURL>http://live.gnome.org/Rygel</modelURL>
     <UDN></UDN>
     <serviceList>
diff --git a/data/xml/MediaServer2.xml b/data/xml/MediaServer2.xml
index 9c17794..95021f8 100644
--- a/data/xml/MediaServer2.xml
+++ b/data/xml/MediaServer2.xml
@@ -12,10 +12,7 @@
 <manufacturerURL>http://live.gnome.org/Rygel</manufacturerURL>
 <modelName>Rygel</modelName>
 <modelNumber>0.1</modelNumber>
-<modelDescription></modelDescription>
 <serialNumber>0000001</serialNumber>
-<UPC></UPC>
-<presentationURL></presentationURL>
 <serviceList>
 </serviceList>
 <dlna:X_DLNADOC>DMS-1.50</dlna:X_DLNADOC>
diff --git a/src/rygel/rygel-root-device-factory.vala b/src/rygel/rygel-root-device-factory.vala
index 2e43833..36c1e94 100644
--- a/src/rygel/rygel-root-device-factory.vala
+++ b/src/rygel/rygel-root-device-factory.vala
@@ -120,7 +120,9 @@ internal class Rygel.RootDeviceFactory {
                                         plugin.title);
 
         if (plugin.description != null) {
-            this.set_description (device_element, plugin.description);
+            device_element->new_child (null,
+                                       "modelDescription",
+                                       plugin.description);
         }
 
         /* Then list each icon */
@@ -177,21 +179,6 @@ internal class Rygel.RootDeviceFactory {
         }
     }
 
-    private void set_description (Xml.Node *device_element,
-                                  string    description) {
-        Xml.Node *element = XMLUtils.get_element (device_element,
-                                                  "modelDescription",
-                                                  null);
-        if (element == null) {
-            warning (_("XML node '%s' not found."),
-                       "/root/device/modelDescription");
-
-            return;
-        }
-
-        element->set_content (description);
-    }
-
     private void add_services_to_desc (Xml.Node *device_element,
                                        Plugin    plugin) {
         Xml.Node *service_list_node = XMLUtils.get_element (device_element,