eog r4626 - in branches/gnome-2-22: . src

[friemann svn gnome org]

Author: friemann
Date: Sun Jun 22 15:23:46 2008
New Revision: 4626
URL: http://svn.gnome.org/viewvc/eog?rev=4626&view=rev

Log:
2008-06-22  Felix Riemann  <friemann svn gnome org>

	* src/eog-window.c: (eog_window_run_fullscreen):
	Remember to stop the slideshow timer when switching from slideshow to
	normal fullscreen mode. Fixes bug #539495.


Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/src/eog-window.c

Modified: branches/gnome-2-22/src/eog-window.c
==============================================================================
--- branches/gnome-2-22/src/eog-window.c	(original)
+++ branches/gnome-2-22/src/eog-window.c	Sun Jun 22 15:23:46 2008
@@ -2044,6 +2044,10 @@
 	if (slideshow) {
 		priv->mode = EOG_WINDOW_MODE_SLIDESHOW;
 	} else {
+		/* Stop the timer if we come from slideshowing */
+		if (priv->mode == EOG_WINDOW_MODE_SLIDESHOW)
+			slideshow_clear_timeout (window);
+
 		priv->mode = EOG_WINDOW_MODE_FULLSCREEN;
 	}
 
@@ -2129,11 +2133,9 @@
 	eog_application_screensaver_disable (EOG_APP);
 #endif
 
-	if (slideshow) {
-		eog_window_update_slideshow_action (window);
-	} else {
-		eog_window_update_fullscreen_action (window);
-	}
+	/* Update both actions as we could've already been in one those modes */
+	eog_window_update_slideshow_action (window);
+	eog_window_update_fullscreen_action (window);
 }
 
 static void