Escape unfocus page entry. Fixes bug #345809.

[evince.git] / shell / ev-window.c

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 1eafe51c331b644c47bea8e9d9d07f12b0739894..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);
                                                         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);
 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);
 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);
 
                              "presentation", &presentation,
                              NULL);
 

-               if (fullscreen)
+               if (fullscreen) {

                        ev_window_stop_fullscreen (window);
                        ev_window_stop_fullscreen (window);

-               if (presentation)
+               } else if (presentation) {

                        ev_window_stop_presentation (window);
                        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");
 
                if (fullscreen && presentation)
                        g_warning ("Both fullscreen and presentation set somehow");


@@ -3442,7 +3448,7 @@ static const GtkActionEntry entries[] = {
 /* Toggle items */
 static const GtkToggleActionEntry toggle_entries[] = {
        /* View Menu */
 /* Toggle items */
 static const GtkToggleActionEntry toggle_entries[] = {
        /* View Menu */

-       { "ViewToolbar", NULL, N_("_Toolbar"), "<shift><control>T",
+       { "ViewToolbar", NULL, N_("_Toolbar"), NULL,

          N_("Show or hide the toolbar"),
          G_CALLBACK (ev_window_view_toolbar_cb), TRUE },
         { "ViewSidebar", GTK_STOCK_INDEX, N_("Side _Pane"), "F9",
          N_("Show or hide the toolbar"),
          G_CALLBACK (ev_window_view_toolbar_cb), TRUE },
         { "ViewSidebar", GTK_STOCK_INDEX, N_("Side _Pane"), "F9",