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 8580a64504808b3262ab76e5e62634538b926c1e..b6ebb02020d60b797d2b6655173ee984336269b5 100644 (file)
--- 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 256d94acffc1765d67f9b2712f3511194b9c8422..e95c921373ac365a3d78051a0d2c439bbd552847 100644 (file)
--- 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");