totem r5390 - in trunk: . src/backend

[hadess svn gnome org]

Author: hadess
Date: Mon May  5 10:05:25 2008
New Revision: 5390
URL: http://svn.gnome.org/viewvc/totem?rev=5390&view=rev

Log:
2008-05-05  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): Fix possible warnings
	when the URL doesn't have any local paths. Remove some useless
	condition in the GStreamer backend, there was no MRL, we remove it a
	few lines before



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	Mon May  5 10:05:25 2008
@@ -2645,13 +2645,6 @@
   GST_DEBUG ("mrl = %s", GST_STR_NULL (mrl));
   GST_DEBUG ("subtitle_uri = %s", GST_STR_NULL (subtitle_uri));
   
-  /* hmm... */
-  if (bvw->com->mrl && strcmp (bvw->com->mrl, mrl) == 0) {
-    GST_DEBUG ("same as current mrl");
-    /* FIXME: shouldn't we ensure playing state here? */
-    return TRUE;
-  }
-
   /* this allows non-URI type of files in the thumbnailer and so on */
   file = g_file_new_for_commandline_arg (mrl);
 
@@ -2662,8 +2655,10 @@
     char *path;
 
     path = g_file_get_path (file);
-    bvw->com->mrl = g_filename_to_uri (path, NULL, NULL);
-    g_free (path);
+    if (path) {
+      bvw->com->mrl = g_filename_to_uri (path, NULL, NULL);
+      g_free (path);
+    }
   }
 
   g_object_unref (file);

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	Mon May  5 10:05:25 2008
@@ -2448,8 +2448,10 @@
 
 		file = g_file_new_for_commandline_arg (mrl);
 		path = g_file_get_path (file);
-		bvw->com->mrl = g_filename_to_uri (path, NULL, NULL);
-		g_free (path);
+		if (path != NULL) {
+			bvw->com->mrl = g_filename_to_uri (path, NULL, NULL);
+			g_free (path);
+		}
 		g_object_unref (file);
 
 		if (bvw->com->mrl == NULL)