From 824988231e5924aca2c52fea2c9cac79cb6cc81a Mon Sep 17 00:00:00 2001
From: Radoslav Dorcik <dixiecko@gmail.com>
Date: Mon, 07 Aug 2006 20:44:05 +0000
Subject: Escape unfocus page entry. Fixes bug #345809.

2006-08-07  Radoslav Dorcik <dixiecko@gmail.com>

	* shell/ev-window.c: (ev_window_cmd_escape)

	Escape unfocus page entry. Fixes bug #345809.
---
diff --git a/ChangeLog b/ChangeLog
index 8580a64..b6ebb02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-07  Radoslav Dorcik <dixiecko@gmail.com>
+	
+	* shell/ev-window.c: (ev_window_cmd_escape)
+
+	Escape unfocus page entry. Fixes bug #345809.
+
 2006-08-06  Carlos Garcia Campos  <carlosgc@gnome.org>
 
 	* pdf/ev-poppler.cc: (ev_link_dest_from_dest), (ev_link_from_action),
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 256d94a..e95c921 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -211,8 +211,10 @@ static void     ev_window_set_page_mode                 (EvWindow         *windo
 							 EvWindowPageMode  page_mode);
 static void	ev_window_xfer_job_cb  			(EvJobXfer        *job,
 							 gpointer          data);
+#ifdef WITH_GTK_PRINT
 static void     ev_window_print_job_cb                  (EvJobPrint       *job,
 							 EvWindow         *window);
+#endif
 static void     ev_window_sizing_mode_changed_cb        (EvView           *view,
 							 GParamSpec       *pspec,
 							 EvWindow         *ev_window);
@@ -2606,10 +2608,14 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window)
 			      "presentation", &presentation,
 			      NULL);
 
-		if (fullscreen)
+		if (fullscreen) {
 			ev_window_stop_fullscreen (window);
-		if (presentation)
+		} else if (presentation) {
 			ev_window_stop_presentation (window);
+			gtk_widget_grab_focus (window->priv->view);
+		} else {
+			gtk_widget_grab_focus (window->priv->view);
+		}
 
 		if (fullscreen && presentation)
 			g_warning ("Both fullscreen and presentation set somehow");
--
cgit v0.9.1