rhythmbox r5993 - in trunk: . plugins/mtpdevice

[jmatthew svn gnome org]

Author: jmatthew
Date: Thu Oct 23 21:47:44 2008
New Revision: 5993
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5993&view=rev

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

	* plugins/mtpdevice/rb-mtp-source.c:
	(rb_mtp_source_transfer_track_to_disk),
	(rb_mtp_source_get_playback_uri):
	Add a bit more debug/error output.


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	Thu Oct 23 21:47:44 2008
@@ -579,6 +579,7 @@
 	int ret = -1;
 
 	if (device == NULL || track == NULL || strlen (uri) == 0) {
+		rb_debug ("device (%p), track (%p), or URI (%s) not supplied", device, track, uri);
 		return FALSE;
 	}
 
@@ -600,6 +601,7 @@
 	LIBMTP_track_t *track;
 	char *path;
 	char *uri = NULL;
+	GError *error = NULL;
 
 	priv = MTP_SOURCE_GET_PRIVATE (data);
 
@@ -608,7 +610,13 @@
 				g_get_tmp_dir (),
 				rhythmdb_entry_dup_string (entry, RHYTHMDB_PROP_ARTIST),
 				rhythmdb_entry_dup_string (entry, RHYTHMDB_PROP_TITLE));
-	uri = g_filename_to_uri (path, NULL, NULL);
+	uri = g_filename_to_uri (path, NULL, &error);
+	if (error != NULL) {
+		g_warning ("unable to convert path %s to filename: %s", path, error->message);
+		g_error_free (error);
+		g_free (path);
+		return NULL;
+	}
 	g_free (path);
 
 	if (rb_mtp_source_transfer_track_to_disk (priv->device, track, uri) == TRUE) {