rygel r387 - in trunk/src: plugins/dvb plugins/test plugins/tracker rygel

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Thu Dec 25 12:01:26 2008
New Revision: 387
URL: http://svn.gnome.org/viewvc/rygel?rev=387&view=rev

Log:
Remove leaky hack to assign unowned strings to weak fields.

The fields are no longer 'weak' so unowned strings can simply be assigned
to them and vala will take care of them for us.

Modified:
   trunk/src/plugins/dvb/rygel-dvb-channel.vala
   trunk/src/plugins/test/rygel-test-item.vala
   trunk/src/plugins/tracker/rygel-tracker-image-item.vala
   trunk/src/plugins/tracker/rygel-tracker-music-item.vala
   trunk/src/plugins/tracker/rygel-tracker-video-item.vala
   trunk/src/rygel/rygel-media-item.vala

Modified: trunk/src/plugins/dvb/rygel-dvb-channel.vala
==============================================================================
--- trunk/src/plugins/dvb/rygel-dvb-channel.vala	(original)
+++ trunk/src/plugins/dvb/rygel-dvb-channel.vala	Thu Dec 25 12:01:26 2008
@@ -64,10 +64,7 @@
         }
 
         this.res.mime_type = "video/mpeg";
-        // FIXME: (Leaky) Hack to assign the string to weak fields
-        string uri = this.channel_list.GetChannelURL (cid);
-        string *uri_ptr = #uri;
-        this.res.uri = uri_ptr;
+        this.res.uri = this.channel_list.GetChannelURL (cid);
     }
 }
 

Modified: trunk/src/plugins/test/rygel-test-item.vala
==============================================================================
--- trunk/src/plugins/test/rygel-test-item.vala	(original)
+++ trunk/src/plugins/test/rygel-test-item.vala	Thu Dec 25 12:01:26 2008
@@ -45,14 +45,11 @@
                      string   path) {
         base (id, parent_id, title, upnp_class, streamer);
 
-        // FIXME: (Leaky) Hack to assign the string to weak fields
-        string *mime_type = mime;
-        this.res.mime_type = mime_type;
+        this.res.mime_type = mime;
         this.author = TEST_AUTHOR;
         this.path= path;
 
-        string *uri = streamer.create_uri_for_path (path);
-        this.res.uri = uri;
+        this.res.uri = streamer.create_uri_for_path (path);
 
         streamer.stream_available += this.on_stream_available;
     }

Modified: trunk/src/plugins/tracker/rygel-tracker-image-item.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-image-item.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-image-item.vala	Thu Dec 25 12:01:26 2008
@@ -100,13 +100,10 @@
             this.date = seconds_to_iso8601 (values[Metadata.IMAGE_DATE]);
         }
 
-        // FIXME: (Leaky) Hack to assign the string to weak fields
-        string *mime = #values[Metadata.MIME];
-        this.res.mime_type = mime;
+        this.res.mime_type = values[Metadata.MIME];
         this.author = values[Metadata.CREATOR];
         this.album = values[Metadata.ALBUM];
-        string *uri = this.uri_from_path (path);
-        this.res.uri = uri;
+        this.res.uri = this.uri_from_path (path);
     }
 }
 

Modified: trunk/src/plugins/tracker/rygel-tracker-music-item.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-music-item.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-music-item.vala	Thu Dec 25 12:01:26 2008
@@ -96,13 +96,10 @@
             this.date = seconds_to_iso8601 (values[Metadata.DATE_ADDED]);
         }
 
-        // FIXME: (Leaky) Hack to assign the string to weak fields
-        string *mime = #values[Metadata.MIME];
-        this.res.mime_type = mime;
+        this.res.mime_type = values[Metadata.MIME];
         this.author = values[Metadata.ARTIST];
         this.album = values[Metadata.ALBUM];
-        string *uri = this.uri_from_path (path);
-        this.res.uri = uri;
+        this.res.uri = this.uri_from_path (path);
     }
 }
 

Modified: trunk/src/plugins/tracker/rygel-tracker-video-item.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-video-item.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-video-item.vala	Thu Dec 25 12:01:26 2008
@@ -88,12 +88,9 @@
             this.res.height = values[Metadata.HEIGHT].to_int ();
 
         this.date = this.seconds_to_iso8601 (values[Metadata.DATE]);
-        // FIXME: (Leaky) Hack to assign the string to weak fields
-        string *mime = #values[Metadata.MIME];
-        this.res.mime_type = mime;
+        this.res.mime_type = values[Metadata.MIME];
         this.author = values[Metadata.AUTHOR];
-        string *uri = this.uri_from_path (path);
-        this.res.uri = uri;
+        this.res.uri = this.uri_from_path (path);
     }
 }
 

Modified: trunk/src/rygel/rygel-media-item.vala
==============================================================================
--- trunk/src/rygel/rygel-media-item.vala	(original)
+++ trunk/src/rygel/rygel-media-item.vala	Thu Dec 25 12:01:26 2008
@@ -170,8 +170,7 @@
         DIDLLiteResource res = orig_res;
 
         // Then modify the URI and protocol
-        string *uri = this.streamer.create_http_uri_for_item (this);
-        res.uri = uri;
+        res.uri = this.streamer.create_http_uri_for_item (this);
         res.protocol = "http-get";
 
         resources.append (res);