totem r5582 - in trunk: . src/backend

[hadess svn gnome org]

Author: hadess
Date: Wed Aug 20 09:41:30 2008
New Revision: 5582
URL: http://svn.gnome.org/viewvc/totem?rev=5582&view=rev

Log:
2008-08-20  Bastien Nocera  <hadess hadess net>

	* src/backend/bacon-video-widget-gst-0.10.c
	(bacon_video_widget_open_with_subtitle):
	* src/backend/bacon-video-widget-xine.c
	(bacon_video_widget_open_with_subtitle):
	g_file_get_uri() might lose arguments for some MRLs,
	so don't use it, and just copy the MRL itself instead
	(Closes: #545864)



Modified:
   trunk/ChangeLog
   trunk/src/backend/bacon-video-widget-gst-0.10.c
   trunk/src/backend/bacon-video-widget-xine.c

Modified: trunk/src/backend/bacon-video-widget-gst-0.10.c
==============================================================================
--- trunk/src/backend/bacon-video-widget-gst-0.10.c	(original)
+++ trunk/src/backend/bacon-video-widget-gst-0.10.c	Wed Aug 20 09:41:30 2008
@@ -2675,15 +2675,11 @@
     bvw->com->mrl = g_filename_to_uri (path, NULL, NULL);
     g_free (path);
   } else {
-    bvw->com->mrl = g_file_get_uri (file);
+    bvw->com->mrl = g_strdup (mrl);
   }
 
   g_object_unref (file);
 
-  /* No path? Choke on your errors already! */
-  if (bvw->com->mrl == NULL)
-    bvw->com->mrl = g_strdup (mrl);
-
   if (g_str_has_prefix (mrl, "icy:") != FALSE) {
     /* Handle "icy://" URLs from QuickTime */
     g_free (bvw->com->mrl);

Modified: trunk/src/backend/bacon-video-widget-xine.c
==============================================================================
--- trunk/src/backend/bacon-video-widget-xine.c	(original)
+++ trunk/src/backend/bacon-video-widget-xine.c	Wed Aug 20 09:41:30 2008
@@ -2400,11 +2400,10 @@
 		if (path != NULL) {
 			bvw->com->mrl = g_filename_to_uri (path, NULL, NULL);
 			g_free (path);
+		} else {
+			bvw->com->mrl = g_strdup (mrl);
 		}
 		g_object_unref (file);
-
-		if (bvw->com->mrl == NULL)
-			bvw->com->mrl = g_strdup (mrl);
 	}
 
 	if (g_str_has_prefix (mrl, "fd://") != FALSE) {