sound-juicer r2311 - in branches/gnome-2-24: . src

[rburton svn gnome org]

Author: rburton
Date: Mon Sep  8 09:48:04 2008
New Revision: 2311
URL: http://svn.gnome.org/viewvc/sound-juicer?rev=2311&view=rev

Log:
Merged revisions 2309 via svnmerge from 
svn+ssh://rburton svn gnome org/svn/sound-juicer/trunk

........
  r2309 | rburton | 2008-09-08 10:46:06 +0100 (Mon, 08 Sep 2008) | 5 lines
  
  2008-09-08  Ross Burton  <ross burtonini com>
  
  	* src/sj-main.c:
  	Correctly parse CDDA URLs (#550131, thanks Matthew Martin)
........


Modified:
   branches/gnome-2-24/   (props changed)
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/src/sj-main.c

Modified: branches/gnome-2-24/src/sj-main.c
==============================================================================
--- branches/gnome-2-24/src/sj-main.c	(original)
+++ branches/gnome-2-24/src/sj-main.c	Mon Sep  8 09:48:04 2008
@@ -1820,10 +1820,12 @@
 
       /* Mash up the CDDA URIs into a device path */
       if (g_str_has_prefix (uris[0], "cdda://")) {
-        guint len;
-        d = g_strdup_printf ("/dev/%s", uris[0] + strlen ("cdda://"));
-        len = strlen (d);
-        d[len - 1] = '\0';
+      	gint len;
+        d = g_strdup_printf ("/dev/%s%c", uris[0] + strlen ("cdda://"), '\0');
+        /* Take last '/' out of path, or set_device thinks it is part of the device name */
+		len = strlen (d);
+		if (d[len - 1] == '/')
+			d [len - 1] = '\0';
 	set_device (d, TRUE);
 	g_free (d);
       } else {