Fixed mismatched plural forms.

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

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 4a2161bef40aabcfc1a9db844911f019614845b1..3eed46a803bfe54a2ab76bfe2052c0387c25f9a9 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -581,7 +581,7 @@ ev_view_scroll (EvView        *view,
 
        view->jump_to_find_result = FALSE;
 
-       if (view->presentation) {
+       if (view->presentation || view->sizing_mode == EV_SIZING_BEST_FIT) {
                switch (scroll) {
                        case EV_SCROLL_PAGE_BACKWARD:
                        case EV_SCROLL_STEP_BACKWARD:
@@ -2228,6 +2228,12 @@ draw_loading_text (EvView       *view,
        double real_scale;
        int target_width;
 
+       /* Don't annoy users with loading messages during presentations.
+        * FIXME: Temporary "workaround" for
+        * http://bugzilla.gnome.org/show_bug.cgi?id=320352 */
+       if (view->presentation)
+               return;
+
        const char *loading_text = _("Loading...");     
 
        layout = gtk_widget_create_pango_layout (GTK_WIDGET (view), loading_text);