totem r5091 - in trunk: . src

[pwithnall svn gnome org]

Author: pwithnall
Date: Sat Feb  9 20:35:15 2008
New Revision: 5091
URL: http://svn.gnome.org/viewvc/totem?rev=5091&view=rev

Log:
2008-02-09  Philip Withnall  <pwithnall svn gnome org>

	* src/totem.c: (totem_action_load_media),
	(totem_action_toggle_aspect_ratio): Fix some compile warnings.



Modified:
   trunk/ChangeLog
   trunk/src/totem.c

Modified: trunk/src/totem.c
==============================================================================
--- trunk/src/totem.c	(original)
+++ trunk/src/totem.c	Sat Feb  9 20:35:15 2008
@@ -489,18 +489,19 @@
 		if (status == BVW_CAN_PLAY_MISSING_CHANNELS) {
 			//FIXME we need to launch the scanner
 			return FALSE;
-		} else if (status == BVW_CAN_PLAY_UNSUPPORTED) {
-			msg = g_strdup_printf(_("Totem cannot play this type of media (%s) because it is not supported."), _(totem_cd_get_human_readable_name (type)));
 		} else if (status == BVW_CAN_PLAY_MISSING_PLUGINS) {
-			if (type == MEDIA_TYPE_DVD || type == MEDIA_TYPE_VCD) {
-				msg = g_strdup_printf(_("Totem cannot play this type of media (%s) because it does not have the appropriate plugins to be able to read from the disc."), _(totem_cd_get_human_readable_name (type)));
-			} else {
+			if (type == MEDIA_TYPE_DVD || type == MEDIA_TYPE_VCD)
+				msg = g_strdup_printf (_("Totem cannot play this type of media (%s) because it does not have the appropriate plugins to be able to read from the disc."), _(totem_cd_get_human_readable_name (type)));
+			else
 				msg = g_strdup_printf (_("Totem cannot play this type of media (%s) because you do not have the appropriate plugins to handle it."), _(totem_cd_get_human_readable_name (type)));
-			}
-			totem_interface_error_with_link (msg, _("Please install the necessary plugins and restart Totem to be able to play this media."),
-							 "http://www.gnome.org/projects/totem/#codecs";, _("More information about media plugins"),
-							 GTK_WINDOW (totem->win), totem);
+		} else {
+			// Basically BVW_CAN_PLAY_UNSUPPORTED
+			msg = g_strdup_printf(_("Totem cannot play this type of media (%s) because it is not supported."), _(totem_cd_get_human_readable_name (type)));
 		}
+
+		totem_interface_error_with_link (msg, _("Please install the necessary plugins and restart Totem to be able to play this media."),
+							"http://www.gnome.org/projects/totem/#codecs";, _("More information about media plugins"),
+							GTK_WINDOW (totem->win), totem);
 		g_free (msg);
 		return FALSE;
 	}
@@ -1186,7 +1187,6 @@
 void
 totem_action_toggle_aspect_ratio (Totem *totem)
 {
-	GSList *list;
 	GtkAction *action;
 	int tmp;