Fix build with poppler 0.5.9.

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

diff --git a/shell/ev-window.c b/shell/ev-window.c
index d8cd629ad21f75ff1e98abd1f3452965b25a31b0..e9dea310cc8f2e9c632a842b5a965a92d5431bb7 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -700,6 +700,9 @@ ev_window_add_history (EvWindow *window, gint page, EvLink *link)
        EvLink *real_link;
        EvLinkAction *action;
        EvLinkDest *dest;
+
+       if (window->priv->history == NULL)
+               return;
        
        if (link) {
                action = g_object_ref (ev_link_get_action (link));
@@ -2027,6 +2030,11 @@ ev_window_clear_print_job (EvWindow *window)
                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
@@ -3608,6 +3616,9 @@ ev_window_view_toolbar_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)));
 }