Fix Cone disabled message, it should say disabled...

2007-08-31  Bastien Nocera  <hadess@hadess.net>

	* configure.in: Fix Cone disabled message, it should say disabled...

	* src/totem-uri.c: (totem_get_volume_for_media),
	(totem_is_special_mrl): Fix totem_is_special_mrl, as a file:/// URI
	has a volume, but isn't so special, make totem_is_special_mrl static,
	we're not using it anywhere else, Only get the volume monitor when
	we really need it

	* src/totem-uri.h: remove totem_is_special_mrl()

	* src/totem.c: (totem_action_eject), (totem_action_remote): Close the
	currently played item, and free it before we remove items from
	the playlist (in the eject's callbacks), _set_mrl_and_play with a NULL
	MRL means nothing


svn path=/trunk/; revision=4642

5 files changed, 28 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index ce6c396e0..1e08dab42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2007-08-31  Bastien Nocera  <hadess@hadess.net>
 
+	* configure.in: Fix Cone disabled message, it should say disabled...
+
+	* src/totem-uri.c: (totem_get_volume_for_media),
+	(totem_is_special_mrl): Fix totem_is_special_mrl, as a file:/// URI
+	has a volume, but isn't so special, make totem_is_special_mrl static,
+	we're not using it anywhere else, Only get the volume monitor when
+	we really need it
+
+	* src/totem-uri.h: remove totem_is_special_mrl()
+
+	* src/totem.c: (totem_action_eject), (totem_action_remote): Close the
+	currently played item, and free it before we remove items from
+	the playlist (in the eject's callbacks), _set_mrl_and_play with a NULL
+	MRL means nothing
+
+2007-08-31  Bastien Nocera  <hadess@hadess.net>
+
 	* src/disc-test.c: (main): Print the URL that we detected from
 	the device, for DVD and VCDs
 
diff --git a/configure.in b/configure.in
index 0d15f6e91..5881b2dc1 100644
--- a/configure.in
+++ b/configure.in
@@ -1121,7 +1121,7 @@ if test x$enable_browser_plugins = xyes ; then
 	if test x$enable_cone_plugin = xyes ; then
 		AC_MSG_NOTICE([** Cone (VLC) plugin enabled])
 	else
-		AC_MSG_NOTICE([   Cone (VLC) plugin enabled])
+		AC_MSG_NOTICE([   Cone (VLC) plugin disabled])
 	fi
 else
 	AC_MSG_NOTICE([   Browser plugin disabled])
diff --git a/src/totem-uri.c b/src/totem-uri.c
index f6f39a5c6..48b379d96 100644
--- a/src/totem-uri.c
+++ b/src/totem-uri.c
@@ -133,7 +133,6 @@ totem_get_volume_for_media (const char *uri)
 	if (uri == NULL)
 		return NULL;
 
-	monitor = gnome_vfs_get_volume_monitor ();
 	mount = NULL;
 	ret = NULL;
 
@@ -147,25 +146,26 @@ totem_get_volume_for_media (const char *uri)
 	if (mount == NULL)
 		return NULL;
 
+	monitor = gnome_vfs_get_volume_monitor ();
 	ret = totem_get_volume_for_uri (monitor, mount);
 	g_free (mount);
 
 	return ret;
 }
 
-gboolean
+static gboolean
 totem_is_special_mrl (const char *uri)
 {
 	GnomeVFSVolume *vol;
 	gboolean retval;
 
-	if (uri == NULL)
+	if (uri == NULL || g_str_has_prefix (uri, "file:") != FALSE)
 		return FALSE;
 	if (g_str_has_prefix (uri, "dvb:") != FALSE)
 		return TRUE;
 
 	vol = totem_get_volume_for_media (uri);
-	retval = vol != NULL;
+	retval = (vol != NULL);
 	if (vol != NULL)
 		gnome_vfs_volume_unref (vol);
 
diff --git a/src/totem-uri.h b/src/totem-uri.h
index 0ee354962..e08ce4fe5 100644
--- a/src/totem-uri.h
+++ b/src/totem-uri.h
@@ -33,7 +33,6 @@ const char *	totem_dot_dir			(void);
 char *		totem_pictures_dir		(void);
 char*		totem_create_full_path		(const char *path);
 GnomeVFSVolume*	totem_get_volume_for_media	(const char *uri);
-gboolean	totem_is_special_mrl		(const char *uri);
 gboolean	totem_playing_dvd		(const char *uri);
 gboolean	totem_is_block_device		(const char *uri);
 void		totem_setup_file_monitoring	(Totem *totem);
diff --git a/src/totem.c b/src/totem.c
index 43a6e2615..cdc465fe7 100644
--- a/src/totem.c
+++ b/src/totem.c
@@ -337,8 +337,12 @@ totem_action_eject (Totem *totem)
 	if (volume == NULL)
 		return;
 
+	g_free (totem->mrl);
+	totem->mrl = NULL;
+	bacon_video_widget_close (totem->bvw);
+	totem_file_closed (totem);
+
 	/* the volume monitoring will take care of removing the items */
-	totem_playlist_clear_with_gnome_vfs_volume (totem->playlist, volume);
 	gnome_vfs_volume_eject (volume, NULL, NULL);
 	gnome_vfs_volume_unref (volume);
 }
@@ -1890,7 +1894,7 @@ totem_action_remote (Totem *totem, TotemRemoteCommand cmd, const char *url)
 		if (url == NULL) {
 			bacon_video_widget_close (totem->bvw);
 			totem_file_closed (totem);
-			totem_action_set_mrl_and_play (totem, NULL);
+			totem_action_set_mrl (totem, NULL);
 			break;
 		}
 		if (strcmp (url, "dvd:") == 0) {