[evince] shell: Call setup_bookmarks only when bookmarks is not NULL



commit 527bee9e076bc95773e6f27f249103568e51a0de
Author: José Aliste <jaliste src gnome org>
Date:   Wed Aug 27 21:36:59 2014 -0400

    shell: Call setup_bookmarks only when bookmarks is not NULL
    
    This fixes a EV_IS_BOOKMARK warning because without this patch
    we call setup_bookmarks with a NULL parameter when the
    window is created
    
    https://bugzilla.gnome.org/show_bug.cgi?id=735561

 shell/ev-window.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 3b4aa4a..0f6742b 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -2205,6 +2205,7 @@ ev_window_open_uri (EvWindow       *ev_window,
                g_signal_connect_swapped (ev_window->priv->bookmarks, "changed",
                                          G_CALLBACK (ev_window_setup_bookmarks),
                                          ev_window);
+               ev_window_setup_bookmarks (ev_window);
        } else {
                ev_window->priv->bookmarks = NULL;
        }
@@ -2215,7 +2216,6 @@ ev_window_open_uri (EvWindow       *ev_window,
 
        setup_size_from_metadata (ev_window);
        setup_model_from_metadata (ev_window);
-       ev_window_setup_bookmarks (ev_window);
 
        ev_window->priv->load_job = ev_job_load_new (uri);
        g_signal_connect (ev_window->priv->load_job,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]