Give priority to forms over text to set the cursor.

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

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 95f5777d4e09c19336db7a164354f0c1c799980b..9f6f0828ffba403437d6fcc29bc4f0159982c316 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -1093,7 +1093,7 @@ ev_window_setup_document (EvWindow *ev_window)
                                        0, 0, 1.0,
                                        &page_width, &page_height);
                scale = (gdouble)128 / (gdouble)page_width;
                                        0, 0, 1.0,
                                        &page_width, &page_height);
                scale = (gdouble)128 / (gdouble)page_width;

-               
+

                rc = ev_render_context_new (0, 0, scale);
                ev_window->priv->thumbnail_job = ev_job_thumbnail_new (document, rc);
                g_signal_connect (ev_window->priv->thumbnail_job, "finished",
                rc = ev_render_context_new (0, 0, scale);
                ev_window->priv->thumbnail_job = ev_job_thumbnail_new (document, rc);
                g_signal_connect (ev_window->priv->thumbnail_job, "finished",


@@ -2172,6 +2172,11 @@ ev_window_clear_print_job (EvWindow *window)
                g_object_unref (window->priv->print_job);
                window->priv->print_job = NULL;
        }
                g_object_unref (window->priv->print_job);
                window->priv->print_job = NULL;
        }

+
+       if (window->priv->gtk_print_job) {
+               g_object_unref (window->priv->gtk_print_job);
+               window->priv->gtk_print_job = NULL;
+       }

 }
 
 static void
 }
 
 static void


@@ -3793,6 +3798,9 @@ ev_window_view_toolbar_cb (GtkAction *action, EvWindow *ev_window)
 static void
 ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
 {
 static void
 ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
 {

+       if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view)))
+               return;
+           

        update_chrome_flag (ev_window, EV_CHROME_SIDEBAR,
                            gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
 }
        update_chrome_flag (ev_window, EV_CHROME_SIDEBAR,
                            gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
 }


@@ -4426,10 +4434,10 @@ static const GtkToggleActionEntry toggle_entries[] = {
         { "ViewDual", EV_STOCK_VIEW_DUAL, N_("_Dual"), NULL,
          N_("Show two pages at once"),
          G_CALLBACK (ev_window_cmd_dual), FALSE },
         { "ViewDual", EV_STOCK_VIEW_DUAL, N_("_Dual"), NULL,
          N_("Show two pages at once"),
          G_CALLBACK (ev_window_cmd_dual), FALSE },

-        { "ViewFullscreen", NULL, N_("_Fullscreen"), "F11",
+        { "ViewFullscreen", GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), "F11",

           N_("Expand the window to fill the screen"),
           G_CALLBACK (ev_window_cmd_view_fullscreen) },
           N_("Expand the window to fill the screen"),
           G_CALLBACK (ev_window_cmd_view_fullscreen) },

-        { "ViewPresentation", NULL, N_("_Presentation"), "F5",
+        { "ViewPresentation", EV_STOCK_RUN_PRESENTATION, N_("_Presentation"), "F5",

           N_("Run document as a presentation"),
           G_CALLBACK (ev_window_cmd_view_presentation) },
         { "ViewBestFit", EV_STOCK_ZOOM_PAGE, N_("_Best Fit"), NULL,
           N_("Run document as a presentation"),
           G_CALLBACK (ev_window_cmd_view_presentation) },
         { "ViewBestFit", EV_STOCK_ZOOM_PAGE, N_("_Best Fit"), NULL,


@@ -4494,6 +4502,7 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group)
                               "name", PAGE_SELECTOR_ACTION,
                               "label", _("Page"),
                               "tooltip", _("Select Page"),
                               "name", PAGE_SELECTOR_ACTION,
                               "label", _("Page"),
                               "tooltip", _("Select Page"),

+                              "icon_name", "text-x-generic",

                               "visible_overflown", FALSE,
                               NULL);
        g_signal_connect (action, "activate_link",
                               "visible_overflown", FALSE,
                               NULL);
        g_signal_connect (action, "activate_link",