[gnome-dvb-daemon/gst-1.0] dvb-daemon: correction channel url

[Sebastian Polsterl <sebp src gnome org>]

commit 1aec8880e4b98c3a4a1882c2c981249d0402c914
Author: Stefan Ringel <linuxtv stefanringel de>
Date:   Sat Jul 26 21:06:46 2014 +0200

    dvb-daemon: correction channel url

 src/Channel.vala     |    5 ++---
 src/DeviceGroup.vala |    2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/Channel.vala b/src/Channel.vala
index 9bf31fc..4d834e7 100644
--- a/src/Channel.vala
+++ b/src/Channel.vala
@@ -50,9 +50,8 @@ namespace DVB {
         }
         public string URL {
             owned get {
-                return "rtsp://%s:8554/%u/%u/%s".printf (
-                        RTSPServer.get_address (), this.GroupId, this.Sid,
-                        Utils.remove_nonalphanums (this.Name));
+                return "rtsp://%s:8554/%u/%u".printf (
+                        RTSPServer.get_address (), this.GroupId, this.Sid);
             }
         }
 
diff --git a/src/DeviceGroup.vala b/src/DeviceGroup.vala
index 072a4a8..a689c55 100644
--- a/src/DeviceGroup.vala
+++ b/src/DeviceGroup.vala
@@ -83,6 +83,8 @@ namespace DVB {
                 bool with_epg_scanner=true) {
             Object (Id: id, Channels: new ChannelList (channels_conf), RecordingsDirectory: recordings_dir, 
Type: type);
 
+           Channels.GroupId = this.Id;
+
             if (with_epg_scanner) {
                 this._epgscanner = new EPGScanner (this);
             } else {