[totem] main: Show OSD even when not in fullscreen

[Bastien Nocera <hadess src gnome org>]

commit 1491a764d59aefdc50904f2f28f30be63b43f2c3
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Apr 18 17:01:13 2012 +0100

    main: Show OSD even when not in fullscreen
    
    https://bugzilla.gnome.org/show_bug.cgi?id=585003

 src/totem-object.c |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/src/totem-object.c b/src/totem-object.c
index 888b1f7..3db6b0c 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -3061,8 +3061,7 @@ totem_object_action_remote (TotemObject *totem, TotemRemoteCommand cmd, const ch
 	}
 
 	if (handled != FALSE
-			&& gtk_window_is_active (GTK_WINDOW (totem->win))
-			&& totem_fullscreen_is_fullscreen (totem->fs) != FALSE) {
+	    && gtk_window_is_active (GTK_WINDOW (totem->win))) {
 		totem_fullscreen_show_popups_or_osd (totem->fs, icon_name, TRUE);
 	}
 }
@@ -3296,14 +3295,12 @@ on_video_button_press_event (BaconVideoWidget *bvw, GdkEventButton *event,
 		totem_action_fullscreen_toggle(totem);
 		return TRUE;
 	} else if (event->type == GDK_BUTTON_PRESS && event->button == 2) {
-		if (totem_is_fullscreen (totem) != FALSE) {
-			const char *icon_name;
-			if (bacon_video_widget_is_playing (totem->bvw) == FALSE)
-				icon_name = "media-playback-start-symbolic";
-			else
-				icon_name = "media-playback-pause-symbolic";
-			totem_fullscreen_show_popups_or_osd (totem->fs, icon_name, FALSE);
-		}
+		const char *icon_name;
+		if (bacon_video_widget_is_playing (totem->bvw) == FALSE)
+			icon_name = "media-playback-start-symbolic";
+		else
+			icon_name = "media-playback-pause-symbolic";
+		totem_fullscreen_show_popups_or_osd (totem->fs, icon_name, FALSE);
 		totem_action_play_pause (totem);
 		return TRUE;
 	} else if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
@@ -3638,7 +3635,7 @@ totem_action_handle_key_press (TotemObject *totem, GdkEventKey *event)
 		retval = FALSE;
 	}
 
-	if (totem_is_fullscreen (totem) != FALSE && icon_name != NULL)
+	if (icon_name != NULL)
 		totem_fullscreen_show_popups_or_osd (totem->fs,
 						     icon_name,
 						     FALSE);