Escape link title before setting it in the model

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

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 4c893f3bb67b896771ca69674ea20104f406116e..19b78f33f203de36e7b6dd5a412b31a7c481f989 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -2130,7 +2130,7 @@ ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_page_cache_prev_page (ev_window->priv->page_cache);
+       ev_view_previous_page (EV_VIEW (ev_window->priv->view));
 }
 
 static void
@@ -2138,7 +2138,7 @@ ev_window_cmd_go_next_page (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_page_cache_next_page (ev_window->priv->page_cache);
+       ev_view_next_page (EV_VIEW (ev_window->priv->view));
 }
 
 static void
@@ -2656,6 +2656,7 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
                        ev_document_find_cancel (EV_DOCUMENT_FIND (ev_window->priv->document));
                        ev_document_doc_mutex_unlock ();
 
+                       update_action_sensitivity (ev_window);
                        egg_find_bar_set_status_text (EGG_FIND_BAR (ev_window->priv->find_bar),
                                                      NULL);
                        gtk_widget_queue_draw (GTK_WIDGET (ev_window->priv->view));
@@ -2690,21 +2691,13 @@ zoom_control_changed_cb (EphyZoomAction *action,
 static void
 ev_window_finalize (GObject *object)
 {
-       gboolean empty = TRUE;
-       GList *list, *windows;
+       GList *windows = ev_application_get_windows (EV_APP);
 
-
-       windows = gtk_window_list_toplevels ();
-
-       for (list = windows; list; list = list->next) {
-               if (EV_IS_WINDOW (list->data)) {
-                       empty = FALSE;
-                       break;
-               }
-       }
-       
-       if (empty)
+       if (windows == NULL) {
                ev_application_shutdown (EV_APP);
+       } else {
+               g_list_free (windows);
+       }
        
        g_list_free (windows);
        G_OBJECT_CLASS (ev_window_parent_class)->finalize (object);