*** empty log message ***

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

diff --git a/shell/ev-window.c b/shell/ev-window.c
index fe2d0a873dda0f3f03b1e6b9e256489e91f98daa..a3a4457d8e8ed7b0488b19aa93fcb3e68f56c469 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -309,8 +309,8 @@ update_action_sensitivity (EvWindow *ev_window)
 
         /* Go menu */
        if (document) {
-               set_action_sensitive (ev_window, "GoPreviousPage", ev_view_can_previous_page (view));
-               set_action_sensitive (ev_window, "GoNextPage", ev_view_can_next_page (view));
+               set_action_sensitive (ev_window, "GoPreviousPage", page > 0);
+               set_action_sensitive (ev_window, "GoNextPage", page < n_pages - 1);
                set_action_sensitive (ev_window, "GoFirstPage", page > 0);
                set_action_sensitive (ev_window, "GoLastPage", page < n_pages - 1);
        } else {
@@ -625,11 +625,12 @@ setup_document_from_metadata (EvWindow *window)
 {
        char *uri = window->priv->uri;
        GValue page = { 0, };
+       gint new_page;
 
-       /* Page */
        if (uri && ev_metadata_manager_get (uri, "page", &page, TRUE)) {
+               new_page = CLAMP (g_value_get_int (&page), 0, ev_page_cache_get_n_pages (window->priv->page_cache) - 1);
                ev_page_cache_set_current_page (window->priv->page_cache,
-                                               g_value_get_int (&page));
+                                               new_page);
        }
 }
 
@@ -750,14 +751,14 @@ setup_view_from_metadata (EvWindow *window)
 
        /* Presentation */
        if (ev_metadata_manager_get (uri, "presentation", &presentation, FALSE)) {
-               if (g_value_get_boolean (&presentation)) {
+               if (g_value_get_boolean (&presentation) && uri) {
                        ev_window_run_presentation (window);
                }
        }
 
        /* Fullscreen */
        if (ev_metadata_manager_get (uri, "fullscreen", &fullscreen, FALSE)) {
-               if (g_value_get_boolean (&fullscreen)) {
+               if (g_value_get_boolean (&fullscreen) && uri) {
                        ev_window_run_fullscreen (window);
                }
        }
@@ -1092,6 +1093,8 @@ file_open_dialog_response_cb (GtkWidget *chooser,
                g_slist_foreach (uris, (GFunc)g_free, NULL);    
                g_slist_free (uris);
        }
+       ev_application_set_chooser_uri (EV_APP, 
+                                       gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (chooser)));
 
        gtk_widget_destroy (chooser);
 }
@@ -1112,7 +1115,10 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
        ev_document_types_add_filters (chooser, NULL);
        gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), TRUE);
        gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), FALSE);
-
+       if (ev_application_get_chooser_uri (EV_APP) != NULL)
+               gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (chooser),
+                                         ev_application_get_chooser_uri (EV_APP));
+       
        g_signal_connect (chooser, "response",
                          G_CALLBACK (file_open_dialog_response_cb),
                          window);
@@ -2089,7 +2095,7 @@ ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
        ev_window_open_uri (ev_window, uri);
 
        /* In case the number of pages in the document has changed. */
-       page = CLAMP (page, 0, ev_page_cache_get_n_pages (ev_window->priv->page_cache));
+       page = CLAMP (page, 0, ev_page_cache_get_n_pages (ev_window->priv->page_cache) - 1);
 
        ev_page_cache_set_current_page (ev_window->priv->page_cache, page);
 
@@ -2486,6 +2492,9 @@ view_menu_popup_cb (EvView         *view,
        gboolean   show_external = FALSE;
        gboolean   show_internal = FALSE;
        GtkAction *action;
+
+       if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view)))
+               return FALSE;
        
        if (ev_window->priv->link)
                g_object_unref (ev_window->priv->link);
@@ -2529,7 +2538,7 @@ view_menu_popup_cb (EvView         *view,
        gtk_menu_popup (GTK_MENU (popup), NULL, NULL,
                        NULL, NULL,
                        3, gtk_get_current_event_time ());
-       return TRUE;
+       return FALSE;
 }
 
 static void