rhythmbox r5995 - in trunk: . plugins/mtpdevice

[jmatthew svn gnome org]

Author: jmatthew
Date: Sat Oct 25 04:53:18 2008
New Revision: 5995
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5995&view=rev

Log:
2008-10-25  Jonathan Matthew  <jonathan d14n org>

	* plugins/mtpdevice/rb-mtp-source.c:
	(rb_mtp_source_get_playback_uri):
	libmtp doesn't want a file:/// URI, it just wants a path.
	Should fix #552614.


Modified:
   trunk/ChangeLog
   trunk/plugins/mtpdevice/rb-mtp-source.c

Modified: trunk/plugins/mtpdevice/rb-mtp-source.c
==============================================================================
--- trunk/plugins/mtpdevice/rb-mtp-source.c	(original)
+++ trunk/plugins/mtpdevice/rb-mtp-source.c	Sat Oct 25 04:53:18 2008
@@ -617,15 +617,16 @@
 		g_free (path);
 		return NULL;
 	}
-	g_free (path);
 
-	if (rb_mtp_source_transfer_track_to_disk (priv->device, track, uri) == TRUE) {
+	if (rb_mtp_source_transfer_track_to_disk (priv->device, track, path) == TRUE) {
 		rb_debug ("playback URI for %s: %s",
 			  rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_LOCATION),
 			  uri);
+		g_free (path);
 		return uri;
 	} else {
 		g_free (uri);
+		g_free (path);
 		return NULL;
 	}
 }