[rygel] core: Fix service & item path conflict

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit dbb7862394aebbe2640e94f6c17fe1a84a411317
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Fri Dec 17 14:57:20 2010 +0200

    core: Fix service & item path conflict
    
    Since our HTTP server uses the same SoupServer for streaming items as
    GUPnP does for serving description files, we need to change the (external)
    paths of services to not conflict with that of our items.

 src/rygel/rygel-root-device-factory.vala |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/rygel/rygel-root-device-factory.vala b/src/rygel/rygel-root-device-factory.vala
index a2300cd..ace60d7 100644
--- a/src/rygel/rygel-root-device-factory.vala
+++ b/src/rygel/rygel-root-device-factory.vala
@@ -220,10 +220,10 @@ internal class Rygel.RootDeviceFactory {
         string url = "/" + resource_info.description_path;
         service_node->new_child (null, "SCPDURL", url);
 
-        url = "/" + plugin_name + "/" + resource_info.type.name () + "/Event";
+        url = "/Event/" + plugin_name + "/" + resource_info.type.name ();
         service_node->new_child (null, "eventSubURL", url);
 
-        url = "/" + plugin_name + "/" + resource_info.type.name () + "/Control";
+        url = "/Control/" + plugin_name + "/" + resource_info.type.name ();
         service_node->new_child (null, "controlURL", url);
     }