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 7ece884f214d8467bcff4b5fdf1d91e941ef0c66..e9dea310cc8f2e9c632a842b5a965a92d5431bb7 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -68,8 +68,8 @@
 #include "ev-metadata-manager.h"
 #include "ev-file-helpers.h"
 #include "ev-utils.h"
 #include "ev-metadata-manager.h"
 #include "ev-file-helpers.h"
 #include "ev-utils.h"

-#include "ev-debug.h"

 #include "ev-history.h"
 #include "ev-history.h"

+#include "ev-image.h"

 
 #ifdef WITH_GNOME_PRINT
 #include "ev-print-job.h"
 
 #ifdef WITH_GNOME_PRINT
 #include "ev-print-job.h"


@@ -89,12 +89,13 @@
 #include <gtk/gtk.h>
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <gtk/gtk.h>
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs-utils.h>

+#include <libgnomevfs/gnome-vfs-async-ops.h>

 #include <gconf/gconf-client.h>
 
 #include <gconf/gconf-client.h>
 

-#include "totem-scrsaver.h"
-

 #include <string.h>
 
 #include <string.h>
 

+char *xdg_user_dir_lookup (char *type);
+

 typedef enum {
        PAGE_MODE_DOCUMENT,
        PAGE_MODE_PASSWORD
 typedef enum {
        PAGE_MODE_DOCUMENT,
        PAGE_MODE_PASSWORD


@@ -153,12 +154,10 @@ struct _EvWindowPrivate {
        GtkWidget *fullscreen_popup;
        guint      fullscreen_timeout_id;
 
        GtkWidget *fullscreen_popup;
        guint      fullscreen_timeout_id;
 

-       /* Screensaver */
-       TotemScrsaver *screensaver;
-
-       /* Popup link */
+       /* Popup view */

        GtkWidget *view_popup;
        EvLink    *link;
        GtkWidget *view_popup;
        EvLink    *link;

+       EvImage   *image;

 
        /* Popup attachment */
        GtkWidget    *attachment_popup;
 
        /* Popup attachment */
        GtkWidget    *attachment_popup;


@@ -179,7 +178,8 @@ struct _EvWindowPrivate {
        EggRecentViewUIManager *recent_view;
 #endif
 
        EggRecentViewUIManager *recent_view;
 #endif
 

-       EvJob *xfer_job;
+       EvJob *load_job;
+       EvJob *thumbnail_job;

 #ifdef WITH_GNOME_PRINT
        GnomePrintJob *print_job;
 #endif
 #ifdef WITH_GNOME_PRINT
        GnomePrintJob *print_job;
 #endif


@@ -193,11 +193,6 @@ struct _EvWindowPrivate {
 #endif
 };
 
 #endif
 };
 

-static const GtkTargetEntry ev_drop_types[] = {
-       { "text/uri-list", 0, 0 }
-};
-
-

 #define EV_WINDOW_GET_PRIVATE(object) \
        (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_WINDOW, EvWindowPrivate))
 
 #define EV_WINDOW_GET_PRIVATE(object) \
        (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_WINDOW, EvWindowPrivate))
 


@@ -223,8 +218,10 @@ static void     ev_window_sidebar_visibility_changed_cb (EvSidebar        *ev_si
                                                         EvWindow         *ev_window);
 static void     ev_window_set_page_mode                 (EvWindow         *window,
                                                         EvWindowPageMode  page_mode);
                                                         EvWindow         *ev_window);
 static void     ev_window_set_page_mode                 (EvWindow         *window,
                                                         EvWindowPageMode  page_mode);

-static void    ev_window_xfer_job_cb                   (EvJobXfer        *job,
+static void    ev_window_load_job_cb                   (EvJobLoad        *job,

                                                         gpointer          data);
                                                         gpointer          data);

+static void     ev_window_set_icon_from_thumbnail       (EvJobThumbnail   *job,
+                                                        EvWindow         *ev_window);

 #ifdef WITH_GTK_PRINT
 static void     ev_window_print_job_cb                  (EvJobPrint       *job,
                                                         EvWindow         *window);
 #ifdef WITH_GTK_PRINT
 static void     ev_window_print_job_cb                  (EvJobPrint       *job,
                                                         EvWindow         *window);


@@ -252,6 +249,10 @@ static void     ev_view_popup_cmd_open_link_new_window  (GtkAction        *actio
                                                         EvWindow         *window);
 static void     ev_view_popup_cmd_copy_link_address     (GtkAction        *action,
                                                         EvWindow         *window);
                                                         EvWindow         *window);
 static void     ev_view_popup_cmd_copy_link_address     (GtkAction        *action,
                                                         EvWindow         *window);

+static void     ev_view_popup_cmd_save_image_as         (GtkAction        *action,
+                                                        EvWindow         *window);
+static void     ev_view_popup_cmd_copy_image            (GtkAction        *action,
+                                                        EvWindow         *window);

 static void    ev_attachment_popup_cmd_open_attachment (GtkAction        *action,
                                                         EvWindow *window);
 static void    ev_attachment_popup_cmd_save_attachment_as (GtkAction *action, 
 static void    ev_attachment_popup_cmd_open_attachment (GtkAction        *action,
                                                         EvWindow *window);
 static void    ev_attachment_popup_cmd_save_attachment_as (GtkAction *action, 


@@ -267,9 +268,26 @@ static gboolean fullscreen_motion_notify_cb                (GtkWidget *widget,
 static gboolean fullscreen_leave_notify_cb             (GtkWidget *widget,
                                                         GdkEventCrossing *event,
                                                         gpointer user_data);
 static gboolean fullscreen_leave_notify_cb             (GtkWidget *widget,
                                                         GdkEventCrossing *event,
                                                         gpointer user_data);

+static void    view_handle_link_cb                     (EvView *view, 
+                                                        EvLink *link, 
+                                                        EvWindow *window);

 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 

+static gdouble
+ev_window_get_screen_dpi (EvWindow *ev_window)
+{
+       GdkScreen *screen;
+       gdouble    xdpi, ydpi;
+
+       screen = gtk_window_get_screen (GTK_WINDOW (ev_window));
+
+       xdpi = 25.4 * gdk_screen_get_width (screen) / gdk_screen_get_width_mm (screen);
+       ydpi = 25.4 * gdk_screen_get_height (screen) / gdk_screen_get_height_mm (screen);
+       
+       return (xdpi + ydpi) / 2.0;
+}
+

 static void
 ev_window_set_action_sensitive (EvWindow   *ev_window,
                                const char *name,
 static void
 ev_window_set_action_sensitive (EvWindow   *ev_window,
                                const char *name,


@@ -388,6 +406,7 @@ ev_window_update_actions (EvWindow *ev_window)
        EvView *view = EV_VIEW (ev_window->priv->view);
        int n_pages = 0, page = -1;
        gboolean has_pages = FALSE;
        EvView *view = EV_VIEW (ev_window->priv->view);
        int n_pages = 0, page = -1;
        gboolean has_pages = FALSE;

+       gboolean presentation_mode;

 
        if (ev_window->priv->document && ev_window->priv->page_cache) {
                page = ev_page_cache_get_current_page (ev_window->priv->page_cache);
 
        if (ev_window->priv->document && ev_window->priv->page_cache) {
                page = ev_page_cache_get_current_page (ev_window->priv->page_cache);


@@ -395,17 +414,25 @@ ev_window_update_actions (EvWindow *ev_window)
                has_pages = n_pages > 0;
        }
 
                has_pages = n_pages > 0;
        }
 

-       ev_window_set_action_sensitive (ev_window, "EditCopy", has_pages && ev_view_get_has_selection (view));
+       ev_window_set_action_sensitive (ev_window, "EditCopy",
+                                       has_pages &&
+                                       ev_view_get_has_selection (view));

        ev_window_set_action_sensitive (ev_window, "EditFindNext",
        ev_window_set_action_sensitive (ev_window, "EditFindNext",

-                             ev_view_can_find_next (view));
+                                       ev_view_can_find_next (view));

        ev_window_set_action_sensitive (ev_window, "EditFindPrevious",
        ev_window_set_action_sensitive (ev_window, "EditFindPrevious",

-                             ev_view_can_find_previous (view));
+                                       ev_view_can_find_previous (view));

 
 

+       presentation_mode = ev_view_get_presentation (view);
+       

        ev_window_set_action_sensitive (ev_window, "ViewZoomIn",
        ev_window_set_action_sensitive (ev_window, "ViewZoomIn",

-                             has_pages && ev_view_can_zoom_in (view));
+                                       has_pages &&
+                                       ev_view_can_zoom_in (view) &&
+                                       !presentation_mode);

        ev_window_set_action_sensitive (ev_window, "ViewZoomOut",
        ev_window_set_action_sensitive (ev_window, "ViewZoomOut",

-                             has_pages && ev_view_can_zoom_out (view));
-
+                                       has_pages &&
+                                       ev_view_can_zoom_out (view) &&
+                                       !presentation_mode);
+       

         /* Go menu */
        if (has_pages) {
                ev_window_set_action_sensitive (ev_window, "GoPreviousPage", page > 0);
         /* Go menu */
        if (has_pages) {
                ev_window_set_action_sensitive (ev_window, "GoPreviousPage", page > 0);


@@ -430,6 +457,7 @@ ev_window_update_actions (EvWindow *ev_window)
                                                      ZOOM_CONTROL_ACTION);
 
                real_zoom = ev_view_get_zoom (EV_VIEW (ev_window->priv->view));
                                                      ZOOM_CONTROL_ACTION);
 
                real_zoom = ev_view_get_zoom (EV_VIEW (ev_window->priv->view));

+               real_zoom *= 72.0 / ev_window_get_screen_dpi (ev_window);

                zoom = ephy_zoom_get_nearest_zoom_level (real_zoom);
 
                ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), zoom);
                zoom = ephy_zoom_get_nearest_zoom_level (real_zoom);
 
                ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), zoom);


@@ -440,7 +468,7 @@ static void
 ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive)
 {
        gboolean can_find;
 ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive)
 {
        gboolean can_find;

-       
+

        can_find = window->priv->document && 
            EV_IS_DOCUMENT_FIND (window->priv->document);
 
        can_find = window->priv->document && 
            EV_IS_DOCUMENT_FIND (window->priv->document);
 


@@ -584,7 +612,7 @@ ev_window_is_empty (const EvWindow *ev_window)
        g_return_val_if_fail (EV_IS_WINDOW (ev_window), FALSE);
 
        return (ev_window->priv->document == NULL) && 
        g_return_val_if_fail (EV_IS_WINDOW (ev_window), FALSE);
 
        return (ev_window->priv->document == NULL) && 

-               (ev_window->priv->xfer_job == NULL);
+               (ev_window->priv->load_job == NULL);

 }
 
 static void
 }
 
 static void


@@ -624,20 +652,127 @@ page_changed_cb (EvPageCache *page_cache,
                 gint         page,
                 EvWindow    *ev_window)
 {
                 gint         page,
                 EvWindow    *ev_window)
 {

-       gchar *label;
-       

        ev_window_update_actions (ev_window);
        
        ev_window_update_actions (ev_window);
        

-       if (ev_window->priv->history) {
-               label = ev_page_cache_get_page_label (ev_window->priv->page_cache, page);
-               ev_history_add_page (ev_window->priv->history, page, label);
-               g_free (label);
-       }
-

        if (!ev_window_is_empty (ev_window))
                ev_metadata_manager_set_int (ev_window->priv->uri, "page", page);
 }
 
        if (!ev_window_is_empty (ev_window))
                ev_metadata_manager_set_int (ev_window->priv->uri, "page", page);
 }
 

+typedef struct _FindTask {
+       const gchar *page_label;
+       gchar *chapter;
+} FindTask;
+
+static gboolean
+ev_window_find_chapter (GtkTreeModel *tree_model,
+                       GtkTreePath  *path,
+                       GtkTreeIter  *iter,
+                       gpointer      data)
+{
+       FindTask *task = (FindTask *)data;
+       gchar *page_string;
+       
+       gtk_tree_model_get (tree_model, iter,
+                           EV_DOCUMENT_LINKS_COLUMN_PAGE_LABEL, &page_string, 
+                           -1);
+       
+       if (!page_string)
+               return FALSE;
+       
+       if (!strcmp (page_string, task->page_label)) {
+               gtk_tree_model_get (tree_model, iter,
+                                   EV_DOCUMENT_LINKS_COLUMN_MARKUP, &task->chapter, 
+                                   -1);
+               g_free (page_string);
+               return TRUE;
+       }
+       
+       g_free (page_string);
+       return FALSE;
+}
+
+static void
+ev_window_add_history (EvWindow *window, gint page, EvLink *link)
+{
+       gchar *page_label = NULL;
+       gchar *link_title;
+       FindTask find_task;
+       EvLink *real_link;
+       EvLinkAction *action;
+       EvLinkDest *dest;
+
+       if (window->priv->history == NULL)
+               return;
+       
+       if (link) {
+               action = g_object_ref (ev_link_get_action (link));
+               dest = ev_link_action_get_dest (action);
+               page = ev_link_dest_get_page (dest);
+               page_label = ev_view_page_label_from_dest (EV_VIEW (window->priv->view), dest);
+       } else {
+               dest = ev_link_dest_new_page (page);
+               action = ev_link_action_new_dest (dest);
+               page_label = ev_page_cache_get_page_label (window->priv->page_cache, page);
+       }
+
+       if (!page_label)
+               return;
+       
+       find_task.page_label = page_label;
+       find_task.chapter = NULL;
+       
+       if (EV_IS_DOCUMENT_LINKS (window->priv->document) && 
+           ev_document_links_has_document_links (EV_DOCUMENT_LINKS (window->priv->document))) {
+               GtkTreeModel *model;
+       
+               g_object_get (G_OBJECT (window->priv->sidebar_links), "model", &model, NULL);
+               
+               if (model) {
+                       gtk_tree_model_foreach (model,
+                                               ev_window_find_chapter,
+                                               &find_task);
+       
+                       g_object_unref (model);
+               }
+       }
+
+       if (find_task.chapter)
+               link_title = g_strdup_printf (_("Page %s - %s"), page_label, find_task.chapter);
+       else
+               link_title = g_strdup_printf (_("Page %s"), page_label);
+       
+       real_link = ev_link_new (link_title, action);
+       
+       ev_history_add_link (window->priv->history, real_link);
+
+       g_free (find_task.chapter);
+       g_free (link_title);
+       g_free (page_label);
+       g_object_unref (real_link);
+}
+
+static void
+view_handle_link_cb (EvView *view, EvLink *link, EvWindow *window)
+{
+       int current_page = ev_page_cache_get_current_page (window->priv->page_cache);
+       
+       ev_window_add_history (window, 0, link);
+       ev_window_add_history (window, current_page, NULL);
+}
+
+static void
+history_changed_cb (EvPageCache *page_cache,
+                   gint         page,
+                   EvWindow    *window)
+{
+       int current_page = ev_page_cache_get_current_page (window->priv->page_cache);
+
+       ev_window_add_history (window, page, NULL);
+       ev_window_add_history (window, current_page, NULL);
+
+       return;
+}
+

 static void
 update_document_mode (EvWindow *window, EvDocumentMode mode)
 {
 static void
 update_document_mode (EvWindow *window, EvDocumentMode mode)
 {


@@ -654,10 +789,18 @@ setup_document_from_metadata (EvWindow *window)
 {
        char *uri = window->priv->uri;
        GValue page = { 0, };
 {
        char *uri = window->priv->uri;
        GValue page = { 0, };

+       gint n_pages;

        gint new_page;
 
        gint new_page;
 

+       /* View the previously shown page, but make sure to not open a document on
+        * the last page, since closing it on the last page most likely means the
+        * user was finished reading the document. In that case, reopening should
+        * show the first page. */

        if (uri && ev_metadata_manager_get (uri, "page", &page, TRUE)) {
        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);
+               n_pages = ev_page_cache_get_n_pages (window->priv->page_cache);
+               new_page = CLAMP (g_value_get_int (&page), 0, n_pages - 1);
+               if (new_page == n_pages - 1)
+                       new_page = 0;

                ev_page_cache_set_current_page (window->priv->page_cache,
                                                new_page);
                g_value_unset (&page);
                ev_page_cache_set_current_page (window->priv->page_cache,
                                                new_page);
                g_value_unset (&page);


@@ -704,7 +847,7 @@ setup_sidebar_from_metadata (EvWindow *window, EvDocument *document)
                } else if (strcmp (page_id, THUMBNAILS_SIDEBAR_ID) && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (thumbs), document)) {
                        ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs);
                } else if (strcmp (page_id, ATTACHMENTS_SIDEBAR_ID) && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (attachments), document)) {
                } else if (strcmp (page_id, THUMBNAILS_SIDEBAR_ID) && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (thumbs), document)) {
                        ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs);
                } else if (strcmp (page_id, ATTACHMENTS_SIDEBAR_ID) && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (attachments), document)) {

-                       ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs);
+                       ev_sidebar_set_page (EV_SIDEBAR (sidebar), attachments);

                }
                g_value_unset (&sidebar_page);
        } else if (document && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
                }
                g_value_unset (&sidebar_page);
        } else if (document && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {


@@ -760,8 +903,14 @@ setup_size_from_metadata (EvWindow *window)
         if (window->priv->page_cache &&
            ev_metadata_manager_get (uri, "window_width_ratio", &width_ratio, FALSE) &&
            ev_metadata_manager_get (uri, "window_height_ratio", &height_ratio, FALSE)) {
         if (window->priv->page_cache &&
            ev_metadata_manager_get (uri, "window_width_ratio", &width_ratio, FALSE) &&
            ev_metadata_manager_get (uri, "window_height_ratio", &height_ratio, FALSE)) {

+               

                gint document_width;
                gint document_height;
                gint document_width;
                gint document_height;

+               
+               GdkScreen *screen;
+               
+               gint request_width;
+               gint request_height;

 
                ev_page_cache_get_max_width (window->priv->page_cache, 
                                             0, 1.0,
 
                ev_page_cache_get_max_width (window->priv->page_cache, 
                                             0, 1.0,


@@ -770,13 +919,22 @@ setup_size_from_metadata (EvWindow *window)
                                             0, 1.0,
                                             &document_height);                 
                
                                             0, 1.0,
                                             &document_height);                 
                

+               request_width = g_value_get_double (&width_ratio) * document_width;
+               request_height = g_value_get_double (&height_ratio) * document_height;
+               
+               screen = gtk_window_get_screen (GTK_WINDOW (window));
+               
+               if (screen) {
+                       request_width = MIN (request_width, gdk_screen_get_width (screen));
+                       request_height = MIN (request_width, gdk_screen_get_height (screen));
+               }
+                               

                gtk_window_resize (GTK_WINDOW (window),
                gtk_window_resize (GTK_WINDOW (window),

-                                  g_value_get_double (&width_ratio) * document_width,
-                                  g_value_get_double (&height_ratio) * document_height);
+                                  request_width,
+                                  request_height);

                g_value_unset (&width_ratio);
                g_value_unset (&height_ratio);
        }
                g_value_unset (&width_ratio);
                g_value_unset (&height_ratio);
        }

-

 }
 
 static void
 }
 
 static void


@@ -815,7 +973,11 @@ setup_view_from_metadata (EvWindow *window)
        /* Zoom */
        if (ev_metadata_manager_get (uri, "zoom", &zoom, FALSE) &&
            ev_view_get_sizing_mode (view) == EV_SIZING_FREE) {
        /* Zoom */
        if (ev_metadata_manager_get (uri, "zoom", &zoom, FALSE) &&
            ev_view_get_sizing_mode (view) == EV_SIZING_FREE) {

-               ev_view_set_zoom (view, g_value_get_double (&zoom), FALSE);
+               gdouble zoom_value;
+
+               zoom_value = g_value_get_double (&zoom);
+               zoom_value *= ev_window_get_screen_dpi (window) / 72.0;
+               ev_view_set_zoom (view, zoom_value, FALSE);

                g_value_unset (&zoom);
        }
 
                g_value_unset (&zoom);
        }
 


@@ -869,18 +1031,39 @@ setup_view_from_metadata (EvWindow *window)
 }
 
 static void
 }
 
 static void

+ev_window_clear_thumbnail_job (EvWindow *ev_window)
+{
+       if (ev_window->priv->thumbnail_job != NULL) {
+               ev_job_queue_remove_job (ev_window->priv->thumbnail_job);
+
+               g_signal_handlers_disconnect_by_func (ev_window->priv->thumbnail_job,
+                                                     ev_window_set_icon_from_thumbnail,
+                                                     ev_window);
+               g_object_unref (ev_window->priv->thumbnail_job);
+               ev_window->priv->thumbnail_job = NULL;
+       }
+}
+
+static void
+ev_window_set_icon_from_thumbnail (EvJobThumbnail *job,
+                                  EvWindow       *ev_window)
+{
+       if (job->thumbnail) {
+               gtk_window_set_icon (GTK_WINDOW (ev_window),
+                                    job->thumbnail);
+       }
+
+       ev_window_clear_thumbnail_job (ev_window);
+}
+
+static gboolean

 ev_window_setup_document (EvWindow *ev_window)
 {
        const EvDocumentInfo *info;
 ev_window_setup_document (EvWindow *ev_window)
 {
        const EvDocumentInfo *info;

-       EvDocument *document;
-       EvView *view = EV_VIEW (ev_window->priv->view);
+       EvDocument *document = ev_window->priv->document;

        EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar);
        GtkAction *action;
        EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar);
        GtkAction *action;

-
-       document = ev_window->priv->document;
-       ev_window->priv->page_cache = ev_page_cache_get (ev_window->priv->document);
-       g_signal_connect (ev_window->priv->page_cache, "page-changed", G_CALLBACK (page_changed_cb), ev_window);
-
+       

        if (EV_IS_DOCUMENT_FIND (document)) {
                g_signal_connect_object (G_OBJECT (document),
                                         "find_changed",
        if (EV_IS_DOCUMENT_FIND (document)) {
                g_signal_connect_object (G_OBJECT (document),
                                         "find_changed",


@@ -888,16 +1071,33 @@ ev_window_setup_document (EvWindow *ev_window)
                                         ev_window, 0);
        }
 
                                         ev_window, 0);
        }
 

-       ev_sidebar_set_document (sidebar, document);
+       if (EV_IS_DOCUMENT_THUMBNAILS (document)) {
+               EvRenderContext *rc;
+               gint page_width, page_height;
+               gdouble scale;

 
 

-       if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
-               ev_view_set_document (view, document);
+               ev_window_clear_thumbnail_job (ev_window);
+               
+               ev_page_cache_get_size (ev_window->priv->page_cache,
+                                       0, 0, 1.0,
+                                       &page_width, &page_height);
+               scale = (gdouble)128 / (gdouble)page_width;
+               
+               rc = ev_render_context_new (0, 0, scale);
+               ev_window->priv->thumbnail_job = ev_job_thumbnail_new (document, rc);
+               g_signal_connect (ev_window->priv->thumbnail_job, "finished",
+                                 G_CALLBACK (ev_window_set_icon_from_thumbnail),
+                                 ev_window);
+               ev_job_queue_add_job (EV_JOB (ev_window->priv->thumbnail_job), EV_JOB_PRIORITY_LOW);
+               g_object_unref (rc);

        }
        }

-       ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);

 
 

+       ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);

        ev_window_title_set_document (ev_window->priv->title, document);
        ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);
 
        ev_window_title_set_document (ev_window->priv->title, document);
        ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);
 

+       ev_sidebar_set_document (sidebar, document);
+

        action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION);
        ev_page_action_set_document (EV_PAGE_ACTION (action), document);
        ev_window_setup_action_sensitivity (ev_window);
        action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION);
        ev_page_action_set_document (EV_PAGE_ACTION (action), document);
        ev_window_setup_action_sensitivity (ev_window);


@@ -907,19 +1107,42 @@ ev_window_setup_document (EvWindow *ev_window)
        ev_window->priv->history = ev_history_new ();
        action = gtk_action_group_get_action (ev_window->priv->action_group, NAVIGATION_ACTION);
         ev_navigation_action_set_history (EV_NAVIGATION_ACTION (action), ev_window->priv->history);
        ev_window->priv->history = ev_history_new ();
        action = gtk_action_group_get_action (ev_window->priv->action_group, NAVIGATION_ACTION);
         ev_navigation_action_set_history (EV_NAVIGATION_ACTION (action), ev_window->priv->history);

-        ev_navigation_action_set_window (EV_NAVIGATION_ACTION (action), ev_window);

        
        if (ev_window->priv->properties) {
                ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
                                                   ev_window->priv->document);
        }
        
        
        if (ev_window->priv->properties) {
                ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
                                                   ev_window->priv->document);
        }
        

+       info = ev_page_cache_get_info (ev_window->priv->page_cache);
+       update_document_mode (ev_window, info->mode);
+
+       return FALSE;
+}
+
+static void
+ev_window_set_document (EvWindow *ev_window, EvDocument *document)
+{
+       EvView *view = EV_VIEW (ev_window->priv->view);
+
+       if (ev_window->priv->document)
+               g_object_unref (ev_window->priv->document);
+       ev_window->priv->document = g_object_ref (document);
+       
+       ev_window->priv->page_cache = ev_page_cache_get (ev_window->priv->document);
+       g_signal_connect (ev_window->priv->page_cache, "page-changed",
+                         G_CALLBACK (page_changed_cb), ev_window);
+       g_signal_connect (ev_window->priv->page_cache, "history-changed",
+                         G_CALLBACK (history_changed_cb), ev_window);
+

        setup_size_from_metadata (ev_window);
        setup_size_from_metadata (ev_window);

-       setup_document_from_metadata (ev_window);

        setup_sidebar_from_metadata (ev_window, document);
        setup_sidebar_from_metadata (ev_window, document);

+       setup_document_from_metadata (ev_window);

 
 

-       info = ev_page_cache_get_info (ev_window->priv->page_cache);
-       update_document_mode (ev_window, info->mode);
+       if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
+               ev_view_set_document (view, document);
+       }
+
+       g_idle_add ((GSourceFunc)ev_window_setup_document, ev_window);

 }
 
 static void
 }
 
 static void


@@ -934,7 +1157,7 @@ password_dialog_response (GtkWidget *password_dialog,
                password = ev_password_dialog_get_password (EV_PASSWORD_DIALOG (password_dialog));
                if (password) {
                        ev_document_doc_mutex_lock ();
                password = ev_password_dialog_get_password (EV_PASSWORD_DIALOG (password_dialog));
                if (password) {
                        ev_document_doc_mutex_lock ();

-                       ev_document_security_set_password (EV_DOCUMENT_SECURITY (ev_window->priv->xfer_job->document),
+                       ev_document_security_set_password (EV_DOCUMENT_SECURITY (ev_window->priv->load_job->document),

                                                           password);
                        ev_document_doc_mutex_unlock ();
                }
                                                           password);
                        ev_document_doc_mutex_unlock ();
                }


@@ -943,7 +1166,7 @@ password_dialog_response (GtkWidget *password_dialog,
                ev_password_dialog_save_password (EV_PASSWORD_DIALOG (password_dialog));
 
                ev_window_title_set_type (ev_window->priv->title, EV_WINDOW_TITLE_DOCUMENT);
                ev_password_dialog_save_password (EV_PASSWORD_DIALOG (password_dialog));
 
                ev_window_title_set_type (ev_window->priv->title, EV_WINDOW_TITLE_DOCUMENT);

-               ev_job_queue_add_job (ev_window->priv->xfer_job, EV_JOB_PRIORITY_HIGH);
+               ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH);

                
                gtk_widget_destroy (password_dialog);
                        
                
                gtk_widget_destroy (password_dialog);
                        


@@ -954,14 +1177,14 @@ password_dialog_response (GtkWidget *password_dialog,
        gtk_widget_destroy (password_dialog);
 }
 
        gtk_widget_destroy (password_dialog);
 }
 

-/* Called either by ev_window_xfer_job_cb or by the "unlock" callback on the
+/* Called either by ev_window_load_job_cb or by the "unlock" callback on the

  * password_view page.  It assumes that ev_window->priv->password_* has been set
  * correctly.  These are cleared by password_dialog_response() */
 
 static void
 ev_window_popup_password_dialog (EvWindow *ev_window)
 {
  * password_view page.  It assumes that ev_window->priv->password_* has been set
  * correctly.  These are cleared by password_dialog_response() */
 
 static void
 ev_window_popup_password_dialog (EvWindow *ev_window)
 {

-       g_assert (ev_window->priv->xfer_job);
+       g_assert (ev_window->priv->load_job);

 
        gtk_widget_set_sensitive (ev_window->priv->password_view, FALSE);
 
 
        gtk_widget_set_sensitive (ev_window->priv->password_view, FALSE);
 


@@ -974,7 +1197,7 @@ ev_window_popup_password_dialog (EvWindow *ev_window)
                gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->password_dialog), GTK_WINDOW (ev_window));
 
                g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog),
                gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->password_dialog), GTK_WINDOW (ev_window));
 
                g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog),

-                                          (gpointer *) &(ev_window->priv->password_dialog));
+                                          (gpointer) &(ev_window->priv->password_dialog));

                g_signal_connect (ev_window->priv->password_dialog,
                                  "response",
                                  G_CALLBACK (password_dialog_response),
                g_signal_connect (ev_window->priv->password_dialog,
                                  "response",
                                  G_CALLBACK (password_dialog_response),


@@ -986,16 +1209,16 @@ ev_window_popup_password_dialog (EvWindow *ev_window)
 }
 
 static void
 }
 
 static void

-ev_window_clear_xfer_job (EvWindow *ev_window)
+ev_window_clear_load_job (EvWindow *ev_window)

 {
 {

-    if (ev_window->priv->xfer_job != NULL) {
+    if (ev_window->priv->load_job != NULL) {

 
 

-       if (!ev_window->priv->xfer_job->finished)
-               ev_job_queue_remove_job (ev_window->priv->xfer_job);
+       if (!ev_window->priv->load_job->finished)
+               ev_job_queue_remove_job (ev_window->priv->load_job);

 
 

-       g_signal_handlers_disconnect_by_func (ev_window->priv->xfer_job, ev_window_xfer_job_cb, ev_window);
-       g_object_unref (ev_window->priv->xfer_job);
-       ev_window->priv->xfer_job = NULL;
+       g_signal_handlers_disconnect_by_func (ev_window->priv->load_job, ev_window_load_job_cb, ev_window);
+       g_object_unref (ev_window->priv->load_job);
+       ev_window->priv->load_job = NULL;

     }
 }
 
     }
 }
 


@@ -1053,7 +1276,7 @@ ev_window_clear_temp_file (EvWindow *ev_window)
  * function should _not_ necessarily expect those to exist after being
  * called. */
 static void
  * function should _not_ necessarily expect those to exist after being
  * called. */
 static void

-ev_window_xfer_job_cb  (EvJobXfer *job,
+ev_window_load_job_cb  (EvJobLoad *job,

                        gpointer data)
 {
        EvWindow *ev_window = EV_WINDOW (data);
                        gpointer data)
 {
        EvWindow *ev_window = EV_WINDOW (data);


@@ -1065,29 +1288,25 @@ ev_window_xfer_job_cb  (EvJobXfer *job,
 
        /* Success! */
        if (job->error == NULL) {
 
        /* Success! */
        if (job->error == NULL) {

-
-               if (ev_window->priv->uri)
-                       g_free (ev_window->priv->uri);
-               ev_window->priv->uri = g_strdup (job->uri);
-
-               if (ev_window->priv->local_uri)
-                       g_free (ev_window->priv->local_uri);
-               ev_window->priv->local_uri = 
-                   job->local_uri ? g_strdup (job->local_uri) : NULL;
+               ev_window_set_document (ev_window, document);

                
                

-               if (ev_window->priv->document)
-                       g_object_unref (ev_window->priv->document);
-               ev_window->priv->document = g_object_ref (document);
+               if (job->mode != EV_WINDOW_MODE_PREVIEW) {
+                       setup_view_from_metadata (ev_window);
+               }

 
                if (!ev_window->priv->unlink_temp_file) {
 
                if (!ev_window->priv->unlink_temp_file) {

-                       setup_view_from_metadata (ev_window);

                        ev_window_add_recent (ev_window, ev_window->priv->uri);
                }
 
                        ev_window_add_recent (ev_window, ev_window->priv->uri);
                }
 

-               ev_window_setup_document (ev_window);
-
-               if (job->dest)
-                       ev_window_goto_dest (ev_window, job->dest);
+               if (job->dest) {
+                       EvLink *link;
+                       EvLinkAction *link_action;
+       
+                       link_action = ev_link_action_new_dest (g_object_ref (job->dest));
+                       link = ev_link_new (NULL, link_action);
+                       ev_view_handle_link (EV_VIEW (ev_window->priv->view), link);
+                       g_object_unref (link);
+               }

 
                switch (job->mode) {
                        case EV_WINDOW_MODE_FULLSCREEN:
 
                switch (job->mode) {
                        case EV_WINDOW_MODE_FULLSCREEN:


@@ -1103,7 +1322,7 @@ ev_window_xfer_job_cb  (EvJobXfer *job,
                                break;
                }
 
                                break;
                }
 

-               ev_window_clear_xfer_job (ev_window);           
+               ev_window_clear_load_job (ev_window);           

                return;
        }
 
                return;
        }
 


@@ -1111,8 +1330,6 @@ ev_window_xfer_job_cb  (EvJobXfer *job,
            job->error->code == EV_DOCUMENT_ERROR_ENCRYPTED) {
                gchar *base_name, *file_name;
 
            job->error->code == EV_DOCUMENT_ERROR_ENCRYPTED) {
                gchar *base_name, *file_name;
 

-               g_free (ev_window->priv->uri);
-               ev_window->priv->uri = g_strdup (job->uri);

                setup_view_from_metadata (ev_window);
 
                file_name = gnome_vfs_format_uri_for_display (job->uri);
                setup_view_from_metadata (ev_window);
 
                file_name = gnome_vfs_format_uri_for_display (job->uri);


@@ -1128,7 +1345,7 @@ ev_window_xfer_job_cb  (EvJobXfer *job,
                ev_window_error_dialog (GTK_WINDOW (ev_window), 
                                        _("Unable to open document"),
                                        job->error);
                ev_window_error_dialog (GTK_WINDOW (ev_window), 
                                        _("Unable to open document"),
                                        job->error);

-               ev_window_clear_xfer_job (ev_window);
+               ev_window_clear_load_job (ev_window);

        }       
 
        return;
        }       
 
        return;


@@ -1164,6 +1381,29 @@ ev_window_close_dialogs (EvWindow *ev_window)
        ev_window->priv->properties = NULL;
 }
 
        ev_window->priv->properties = NULL;
 }
 

+static gint
+xfer_update_progress_callback (GnomeVFSAsyncHandle      *handle,
+                              GnomeVFSXferProgressInfo *info,
+                              EvWindow                 *ev_window)
+{
+       switch (info->status) {
+               case GNOME_VFS_XFER_PROGRESS_STATUS_OK:
+                       if (info->phase == GNOME_VFS_XFER_PHASE_COMPLETED) {
+                               ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH);
+                       }
+
+                       return 1;
+               case GNOME_VFS_XFER_PROGRESS_STATUS_VFSERROR:
+               case GNOME_VFS_XFER_PROGRESS_STATUS_OVERWRITE:
+               case GNOME_VFS_XFER_PROGRESS_STATUS_DUPLICATE:
+                       return 1;
+               default:
+                       g_assert_not_reached ();
+       }
+
+       return 0;
+}
+

 void
 ev_window_open_uri (EvWindow       *ev_window,
                    const char     *uri,
 void
 ev_window_open_uri (EvWindow       *ev_window,
                    const char     *uri,


@@ -1171,25 +1411,70 @@ ev_window_open_uri (EvWindow       *ev_window,
                    EvWindowRunMode mode,
                    gboolean        unlink_temp_file)
 {
                    EvWindowRunMode mode,
                    gboolean        unlink_temp_file)
 {

+       GnomeVFSURI *source_uri;
+       GnomeVFSURI *target_uri;
+       

        ev_window_close_dialogs (ev_window);
        ev_window_close_dialogs (ev_window);

-       ev_window_clear_xfer_job (ev_window);
+       ev_window_clear_load_job (ev_window);

        ev_window_clear_local_uri (ev_window);
        ev_view_set_loading (EV_VIEW (ev_window->priv->view), TRUE);
 
        ev_window->priv->unlink_temp_file = unlink_temp_file;
        ev_window_clear_local_uri (ev_window);
        ev_view_set_loading (EV_VIEW (ev_window->priv->view), TRUE);
 
        ev_window->priv->unlink_temp_file = unlink_temp_file;

+
+       if (ev_window->priv->uri)
+               g_free (ev_window->priv->uri);
+       ev_window->priv->uri = g_strdup (uri);
+
+       setup_size_from_metadata (ev_window);

        
        

-       ev_window->priv->xfer_job = ev_job_xfer_new (uri, dest, mode);
-       g_signal_connect (ev_window->priv->xfer_job,
+       ev_window->priv->load_job = ev_job_load_new (uri, dest, mode);
+       g_signal_connect (ev_window->priv->load_job,

                          "finished",
                          "finished",

-                         G_CALLBACK (ev_window_xfer_job_cb),
+                         G_CALLBACK (ev_window_load_job_cb),

                          ev_window);
                          ev_window);

-       ev_job_queue_add_job (ev_window->priv->xfer_job, EV_JOB_PRIORITY_HIGH);
-}

 
 

-void
-ev_window_goto_dest (EvWindow *ev_window, EvLinkDest *dest)
-{
-       ev_view_goto_dest (EV_VIEW (ev_window->priv->view), dest);
+       source_uri = gnome_vfs_uri_new (uri);
+       if (!gnome_vfs_uri_is_local (source_uri) && !ev_window->priv->local_uri) {
+               GnomeVFSAsyncHandle *handle;
+               GList               *slist = NULL;
+               GList               *tlist = NULL;
+               char                *tmp_name;
+               char                *base_name;
+
+               /* We'd like to keep extension of source uri since
+                * it helps to resolve some mime types, say cbz */
+
+               tmp_name = ev_tmp_filename (NULL);
+               base_name = gnome_vfs_uri_extract_short_name (source_uri);
+               ev_window->priv->local_uri = g_strconcat ("file:", tmp_name, "-", base_name, NULL);
+               ev_job_load_set_uri (EV_JOB_LOAD (ev_window->priv->load_job),
+                                    ev_window->priv->local_uri);
+               g_free (base_name);
+               g_free (tmp_name);
+               
+               target_uri = gnome_vfs_uri_new (ev_window->priv->local_uri);
+               
+               slist = g_list_prepend (slist, source_uri);
+               tlist = g_list_prepend (tlist, target_uri);
+               gnome_vfs_async_xfer (&handle, slist, tlist,
+                                     GNOME_VFS_XFER_DEFAULT | GNOME_VFS_XFER_FOLLOW_LINKS,
+                                     GNOME_VFS_XFER_ERROR_MODE_ABORT,
+                                     GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
+                                     GNOME_VFS_PRIORITY_DEFAULT,
+                                     (GnomeVFSAsyncXferProgressCallback)xfer_update_progress_callback,
+                                     ev_window,
+                                     NULL, NULL); 
+               
+               g_list_free (slist);
+               g_list_free (tlist);
+               gnome_vfs_uri_unref (target_uri);
+               gnome_vfs_uri_unref (source_uri);
+               
+               return;
+       }
+
+       gnome_vfs_uri_unref (source_uri);
+       ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH);

 }
 
 static void
 }
 
 static void


@@ -1238,6 +1523,13 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
                gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (chooser),
                                          window->priv->uri);
        }
                gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (chooser),
                                          window->priv->uri);
        }

+       else {
+               char *folder;
+               folder = xdg_user_dir_lookup ("DOCUMENTS");
+               gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser),
+                                                    folder);
+               free (folder);
+       }

        
        g_signal_connect (chooser, "response",
                          G_CALLBACK (file_open_dialog_response_cb),
        
        g_signal_connect (chooser, "response",
                          G_CALLBACK (file_open_dialog_response_cb),


@@ -1290,12 +1582,16 @@ ev_window_create_tmp_symlink (const gchar *filename, GError **error)
 static void
 ev_window_cmd_file_open_copy_at_dest (EvWindow *window, EvLinkDest *dest)
 {
 static void
 ev_window_cmd_file_open_copy_at_dest (EvWindow *window, EvLinkDest *dest)
 {

-       GError *error = NULL;
-       gchar *symlink_uri;
-       gchar *old_filename;
-       gchar *new_filename;
-
-       old_filename = g_filename_from_uri (window->priv->uri, NULL, NULL);
+       GError      *error = NULL;
+       gchar       *symlink_uri;
+       gchar       *old_filename;
+       gchar       *new_filename;
+       const gchar *uri_unc;
+
+       uri_unc = g_object_get_data (G_OBJECT (window->priv->document),
+                                    "uri-uncompressed");
+       old_filename = g_filename_from_uri (uri_unc ? uri_unc : window->priv->uri,
+                                           NULL, NULL);

        new_filename = ev_window_create_tmp_symlink (old_filename, &error);
 
        if (error) {
        new_filename = ev_window_create_tmp_symlink (old_filename, &error);
 
        if (error) {


@@ -1439,13 +1735,11 @@ ev_window_get_recent_file_label (gint index, const gchar *filename)
        p = filename;
        end = filename + length;
  
        p = filename;
        end = filename + length;
  

-       while (p != end)
-       {
+       while (p != end) {

                const gchar *next;
                next = g_utf8_next_char (p);
  
                const gchar *next;
                next = g_utf8_next_char (p);
  

-               switch (*p)
-               {
+               switch (*p) {

                        case '_':
                                g_string_append (str, "__");
                                break;
                        case '_':
                                g_string_append (str, "__");
                                break;


@@ -1496,7 +1790,8 @@ ev_window_setup_recent (EvWindow *ev_window)
 
                info = (GtkRecentInfo *) l->data;
 
 
                info = (GtkRecentInfo *) l->data;
 

-               if (!gtk_recent_info_has_application (info, evince))
+               if (!gtk_recent_info_has_application (info, evince) ||
+                   (gtk_recent_info_is_local (info) && !gtk_recent_info_exists (info)))

                        continue;
 
                action_name = g_strdup_printf ("RecentFile%u", i++);
                        continue;
 
                action_name = g_strdup_printf ("RecentFile%u", i++);


@@ -1560,27 +1855,100 @@ file_save_dialog_response_cb (GtkWidget *fc,
                              gint       response_id,
                              EvWindow  *ev_window)
 {
                              gint       response_id,
                              EvWindow  *ev_window)
 {

-       gboolean success;
-
-       if (response_id == GTK_RESPONSE_OK) {
-               gchar *uri;
-               GError *err = NULL;
+       const gchar *uri_unc;
+       gint         fd;
+       gchar       *filename;
+       gchar       *tmp_filename;
+       GError      *error = NULL;

 
 

-               uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
+       if (response_id != GTK_RESPONSE_OK) {
+               gtk_widget_destroy (fc);
+               return;
+       }
+       

 
 

+       filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (fc));
+       tmp_filename = g_strdup_printf ("%s.XXXXXX", filename);
+       
+       fd = g_mkstemp (tmp_filename);
+       if (fd == -1) {
+               gchar *display_name;
+               gint   save_errno = errno;
+               
+               display_name = g_filename_display_name (tmp_filename);
+               g_set_error (&error,
+                            G_FILE_ERROR,
+                            g_file_error_from_errno (save_errno),
+                            _("Failed to create file “%s”: %s"),
+                            display_name, g_strerror (save_errno));
+               g_free (display_name);
+       } else {
+               gchar *uri;
+               
+               uri = g_filename_to_uri (tmp_filename, NULL, NULL);
+               

                ev_document_doc_mutex_lock ();
                ev_document_doc_mutex_lock ();

-               success = ev_document_save (ev_window->priv->document, uri, &err);
+               ev_document_save (ev_window->priv->document, uri, &error);

                ev_document_doc_mutex_unlock ();
                ev_document_doc_mutex_unlock ();

+               
+               g_free (uri);
+               close (fd);
+       }
+
+       if (!error) {
+               uri_unc = g_object_get_data (G_OBJECT (ev_window->priv->document),
+                                            "uri-uncompressed");
+               if (uri_unc) {
+                       EvCompressionType ctype;
+                       gchar            *uri_comp;
+                       gchar            *uri;
+                       const gchar      *ext;
+
+                       ctype = EV_COMPRESSION_NONE;
+                       
+                       ext = g_strrstr (ev_window->priv->uri, ".gz");
+                       if (ext && g_ascii_strcasecmp (ext, ".gz") == 0)
+                               ctype = EV_COMPRESSION_GZIP;
+                       
+                       ext = g_strrstr (ev_window->priv->uri, ".bz2");
+                       if (ext && g_ascii_strcasecmp (ext, ".bz2") == 0)
+                               ctype = EV_COMPRESSION_BZIP2;
+                       
+                       uri = g_filename_to_uri (tmp_filename, NULL, NULL);
+                       uri_comp = ev_file_compress (uri, ctype, &error);
+                       g_free (uri);
+                       g_unlink (tmp_filename);
+                       g_free (tmp_filename);

 
 

-               if (err) {
-                       gchar *msg;
-                       msg = g_strdup_printf (_("The file could not be saved as “%s”."), uri);
-                       ev_window_error_dialog (GTK_WINDOW (fc), msg, err);
-                       g_free (msg);
+                       if (!uri_comp || error) {
+                               tmp_filename = NULL;
+                       } else {
+                               tmp_filename = g_filename_from_uri (uri_comp,
+                                                                   NULL, NULL);
+                       }
+                       
+                       g_free (uri_comp);

                }
                }

+       }

 
 

+       if (tmp_filename && g_rename (tmp_filename, filename) == -1) {
+               g_unlink (tmp_filename);
+       }
+       
+       if (error) {
+               gchar *msg;
+               gchar *uri;
+               
+               uri = g_filename_to_uri (filename, NULL, NULL);
+               msg = g_strdup_printf (_("The file could not be saved as “%s”."), uri);
+               ev_window_error_dialog (GTK_WINDOW (ev_window), msg, error);
+               g_free (msg);

                g_free (uri);
                g_free (uri);

+               g_error_free (error);

        }
        }

+       
+       g_free (tmp_filename);
+       g_free (filename);

 
        gtk_widget_destroy (fc);
 }
 
        gtk_widget_destroy (fc);
 }


@@ -1591,6 +1959,7 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
        GtkWidget *fc;
        gchar *base_name;
        gchar *file_name;
        GtkWidget *fc;
        gchar *base_name;
        gchar *file_name;

+       gchar *folder;

 
        fc = gtk_file_chooser_dialog_new (
                _("Save a Copy"),
 
        fc = gtk_file_chooser_dialog_new (
                _("Save a Copy"),


@@ -1605,10 +1974,13 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
        gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER (fc), TRUE);    
        file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
        base_name = g_path_get_basename (file_name);
        gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER (fc), TRUE);    
        file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
        base_name = g_path_get_basename (file_name);

+        folder = xdg_user_dir_lookup ("DOCUMENTS");

        gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name);
        gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name);

+        gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (fc), folder);

        g_free (file_name);
        g_free (base_name);
        g_free (file_name);
        g_free (base_name);

-
+        free (folder);
+        

        g_signal_connect (fc, "response",
                          G_CALLBACK (file_save_dialog_response_cb),
                          ev_window);
        g_signal_connect (fc, "response",
                          G_CALLBACK (file_save_dialog_response_cb),
                          ev_window);


@@ -1658,6 +2030,11 @@ ev_window_clear_print_job (EvWindow *window)
                g_object_unref (window->priv->print_job);
                window->priv->print_job = NULL;
        }
                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
 }
 
 static void


@@ -1688,15 +2065,33 @@ ev_window_print_send (EvWindow    *window,
                      const gchar *filename)
 {
        GtkPrintJob *job;
                      const gchar *filename)
 {
        GtkPrintJob *job;

+       GtkPrintSettings *settings;

        GError      *error = NULL;
        
        if (window->priv->gtk_print_job)
                g_object_unref (window->priv->gtk_print_job);
        GError      *error = NULL;
        
        if (window->priv->gtk_print_job)
                g_object_unref (window->priv->gtk_print_job);

+
+       /* Some printers take into account some print settings,
+        * and others don't. However we have exported the document
+        * to a ps or pdf file according to such print settings. So,
+        * we want to send the exported file to printer with those
+        * settings set to default values. 
+        */
+       settings = gtk_print_settings_copy (window->priv->print_settings);
+       gtk_print_settings_set_n_copies (settings, 1);
+       gtk_print_settings_set_page_ranges (settings, NULL, 0);
+       gtk_print_settings_set_page_set (settings, GTK_PAGE_SET_ALL);
+       gtk_print_settings_set_print_pages (settings, GTK_PRINT_PAGES_ALL);
+       gtk_print_settings_set_scale (settings, 1.0);
+       gtk_print_settings_set_collate (settings, FALSE);
+       gtk_print_settings_set_reverse (settings, FALSE);

        
        job = gtk_print_job_new ("evince-print",
                                 window->priv->printer,
        
        job = gtk_print_job_new ("evince-print",
                                 window->priv->printer,

-                                window->priv->print_settings,
+                                settings,

                                 window->priv->print_page_setup);
                                 window->priv->print_page_setup);

+
+       g_object_unref (settings);

        
        window->priv->gtk_print_job = job;
 
        
        window->priv->gtk_print_job = job;
 


@@ -2067,12 +2462,14 @@ ev_window_cmd_file_properties (GtkAction *action, EvWindow *ev_window)
                ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
                                                   ev_window->priv->document);
                g_object_add_weak_pointer (G_OBJECT (ev_window->priv->properties),
                ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
                                                   ev_window->priv->document);
                g_object_add_weak_pointer (G_OBJECT (ev_window->priv->properties),

-                                          (gpointer *) &(ev_window->priv->properties));
+                                          (gpointer) &(ev_window->priv->properties));

                gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->properties),
                                              GTK_WINDOW (ev_window));
        }
 
                gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->properties),
                                              GTK_WINDOW (ev_window));
        }
 

+       ev_document_fc_mutex_lock ();

        gtk_widget_show (ev_window->priv->properties);
        gtk_widget_show (ev_window->priv->properties);

+       ev_document_fc_mutex_unlock ();

 }
                                        
 static void
 }
                                        
 static void


@@ -2302,9 +2699,11 @@ fullscreen_timeout_cb (EvWindow *window)
 {
        EvView *view = EV_VIEW (window->priv->view);
 
 {
        EvView *view = EV_VIEW (window->priv->view);
 

-       if (!view || !ev_view_get_fullscreen (EV_VIEW (view)))
+       if (!view ||
+           (!ev_view_get_fullscreen (EV_VIEW (view)) &&
+            !ev_view_get_presentation (EV_VIEW (view))))

                return FALSE;
                return FALSE;

-       
+

        update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, FALSE);
        ev_view_hide_cursor (EV_VIEW (window->priv->view));
        window->priv->fullscreen_timeout_id = 0;
        update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, FALSE);
        ev_view_hide_cursor (EV_VIEW (window->priv->view));
        window->priv->fullscreen_timeout_id = 0;


@@ -2557,8 +2956,8 @@ ev_window_run_presentation (EvWindow *window)
                          window);
        fullscreen_set_timeout (window);
 
                          window);
        fullscreen_set_timeout (window);
 

-       totem_scrsaver_disable (window->priv->screensaver);
-
+       ev_application_screensaver_disable (EV_APP);
+       

        if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE);
 }
        if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE);
 }


@@ -2585,7 +2984,7 @@ ev_window_stop_presentation (EvWindow *window)
                                              window);
        fullscreen_clear_timeout (window);
 
                                              window);
        fullscreen_clear_timeout (window);
 

-       totem_scrsaver_enable (window->priv->screensaver);
+       ev_application_screensaver_enable (EV_APP);

 
        if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE);
 
        if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE);


@@ -2673,6 +3072,9 @@ ev_window_screen_changed (GtkWidget *widget,
                                  window);
 #endif
        
                                  window);
 #endif
        

+       ev_view_set_screen_dpi (EV_VIEW (window->priv->view),
+                               ev_window_get_screen_dpi (window));
+       

        if (GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed) {
                GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed (widget, old_screen);
        }
        if (GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed) {
                GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed (widget, old_screen);
        }


@@ -2863,14 +3265,10 @@ ev_window_cmd_go_backward (GtkAction *action, EvWindow *ev_window)
 static void
 ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
 {
 static void
 ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
 {

-       char *uri;
-
-       g_return_if_fail (EV_IS_WINDOW (ev_window));
+       gchar *uri;

 
        uri = g_strdup (ev_window->priv->uri);
 
        uri = g_strdup (ev_window->priv->uri);

-

        ev_window_open_uri (ev_window, uri, NULL, 0, FALSE);
        ev_window_open_uri (ev_window, uri, NULL, 0, FALSE);

-

        g_free (uri);
 }
 
        g_free (uri);
 }
 


@@ -3028,8 +3426,11 @@ ev_window_zoom_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window)
         ev_window_update_actions (ev_window);
 
        if (ev_view_get_sizing_mode (view) == EV_SIZING_FREE && !ev_window_is_empty (ev_window)) {
         ev_window_update_actions (ev_window);
 
        if (ev_view_get_sizing_mode (view) == EV_SIZING_FREE && !ev_window_is_empty (ev_window)) {

-               ev_metadata_manager_set_double (ev_window->priv->uri, "zoom",
-                                               ev_view_get_zoom (view));
+               gdouble zoom;
+
+               zoom = ev_view_get_zoom (view);
+               zoom *= 72.0 / ev_window_get_screen_dpi (ev_window);
+               ev_metadata_manager_set_double (ev_window->priv->uri, "zoom", zoom);

        }
 }
 
        }
 }
 


@@ -3128,7 +3529,7 @@ build_comments_string (void)
                                  "Using poppler %s (%s)"),
                                version, backend_name);
 #else
                                  "Using poppler %s (%s)"),
                                version, backend_name);
 #else

-       return g_strdup_printf (_("Document Viewer."));
+       return g_strdup_printf (_("Document Viewer"));

 #endif
 }
 
 #endif
 }
 


@@ -3215,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)
 {
 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)));
 }
        update_chrome_flag (ev_window, EV_CHROME_SIDEBAR,
                            gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
 }


@@ -3266,18 +3670,13 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar  *ev_sidebar,
        }
 }
 
        }
 }
 

-static gboolean
-view_menu_popup_cb (EvView   *view,
-                   EvLink   *link,
-                   EvWindow *ev_window)
+static void
+view_menu_link_popup (EvWindow *ev_window,
+                     EvLink   *link)

 {
 {

-       GtkWidget *popup;

        gboolean   show_external = FALSE;
        gboolean   show_internal = FALSE;
        GtkAction *action;
        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);
        
        if (ev_window->priv->link)
                g_object_unref (ev_window->priv->link);


@@ -3287,26 +3686,23 @@ view_menu_popup_cb (EvView   *view,
        else    
                ev_window->priv->link = NULL;
 
        else    
                ev_window->priv->link = NULL;
 

-       popup = ev_window->priv->view_popup;
-

        if (ev_window->priv->link) {
                EvLinkAction *ev_action;
 
                ev_action = ev_link_get_action (link);
        if (ev_window->priv->link) {
                EvLinkAction *ev_action;
 
                ev_action = ev_link_get_action (link);

-               if (!ev_action)
-                       return FALSE;
-               
-               switch (ev_link_action_get_action_type (ev_action)) {
-                       case EV_LINK_ACTION_TYPE_GOTO_DEST:
-                       case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
-                               show_internal = TRUE;
-                               break;
-                       case EV_LINK_ACTION_TYPE_EXTERNAL_URI:
-                       case EV_LINK_ACTION_TYPE_LAUNCH:
-                               show_external = TRUE;
-                               break;
-                       default:
-                               break;
+               if (ev_action) {
+                       switch (ev_link_action_get_action_type (ev_action)) {
+                               case EV_LINK_ACTION_TYPE_GOTO_DEST:
+                               case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
+                                       show_internal = TRUE;
+                                       break;
+                               case EV_LINK_ACTION_TYPE_EXTERNAL_URI:
+                               case EV_LINK_ACTION_TYPE_LAUNCH:
+                                       show_external = TRUE;
+                                       break;
+                               default:
+                                       break;
+                       }

                }
        }
        
                }
        }
        


@@ -3325,9 +3721,49 @@ view_menu_popup_cb (EvView   *view,
        action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
                                              "OpenLinkNewWindow");
        gtk_action_set_visible (action, show_internal);
        action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
                                              "OpenLinkNewWindow");
        gtk_action_set_visible (action, show_internal);

+}

 
 

-       gtk_menu_popup (GTK_MENU (popup), NULL, NULL,
-                       NULL, NULL,
+static void
+view_menu_image_popup (EvWindow  *ev_window,
+                      EvImage   *image)
+{
+       GtkAction *action;
+       gboolean   show_image = FALSE;
+       
+       if (ev_window->priv->image)
+               g_object_unref (ev_window->priv->image);
+       
+       if (image)
+               ev_window->priv->image = g_object_ref (image);
+       else    
+               ev_window->priv->image = NULL;
+
+       show_image = (ev_window->priv->image != NULL);
+       
+       action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
+                                             "SaveImageAs");
+       gtk_action_set_visible (action, show_image);
+
+       action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
+                                             "CopyImage");
+       gtk_action_set_visible (action, show_image);
+}
+
+static gboolean
+view_menu_popup_cb (EvView   *view,
+                   GObject  *object,
+                   EvWindow *ev_window)
+{
+       if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view)))
+               return FALSE;
+
+       view_menu_link_popup (ev_window,
+                             EV_IS_LINK (object) ? EV_LINK (object) : NULL);
+       view_menu_image_popup (ev_window,
+                              EV_IS_IMAGE (object) ? EV_IMAGE (object) : NULL);
+       
+       gtk_menu_popup (GTK_MENU (ev_window->priv->view_popup),
+                       NULL, NULL, NULL, NULL,

                        3, gtk_get_current_event_time ());
        return TRUE;
 }
                        3, gtk_get_current_event_time ());
        return TRUE;
 }


@@ -3400,8 +3836,6 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
        gboolean visible;
        const char *search_string;
 
        gboolean visible;
        const char *search_string;
 

-       g_return_if_fail (EV_IS_WINDOW (ev_window));
-

        /* Either the string or case sensitivity could have changed,
         * we connect this callback to both. We also connect it
         * to ::visible so when the find bar is hidden, we should
        /* Either the string or case sensitivity could have changed,
         * we connect this callback to both. We also connect it
         * to ::visible so when the find bar is hidden, we should


@@ -3462,7 +3896,9 @@ zoom_control_changed_cb (EphyZoomAction *action,
        ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), mode);
        
        if (mode == EV_SIZING_FREE) {
        ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), mode);
        
        if (mode == EV_SIZING_FREE) {

-               ev_view_set_zoom (EV_VIEW (ev_window->priv->view), zoom, FALSE);
+               ev_view_set_zoom (EV_VIEW (ev_window->priv->view),
+                                 zoom * ev_window_get_screen_dpi (ev_window) / 72.0,
+                                 FALSE);

        }
 }
 
        }
 }
 


@@ -3552,12 +3988,17 @@ ev_window_dispose (GObject *object)
                priv->password_view = NULL;
        }
 
                priv->password_view = NULL;
        }
 

-       if (priv->xfer_job) {
-               ev_window_clear_xfer_job (window);
+       if (priv->load_job) {
+               ev_window_clear_load_job (window);
+       }
+
+       if (priv->thumbnail_job) {
+               ev_window_clear_thumbnail_job (window);

        }
        
        if (priv->local_uri) {
                ev_window_clear_local_uri (window);
        }
        
        if (priv->local_uri) {
                ev_window_clear_local_uri (window);

+               priv->local_uri = NULL;

        }
        
        ev_window_close_dialogs (window);
        }
        
        ev_window_close_dialogs (window);


@@ -3591,6 +4032,11 @@ ev_window_dispose (GObject *object)
                priv->link = NULL;
        }
 
                priv->link = NULL;
        }
 

+       if (priv->image) {
+               g_object_unref (priv->image);
+               priv->image = NULL;
+       }
+

        if (priv->attach_list) {
                g_list_foreach (priv->attach_list,
                                (GFunc) g_object_unref,
        if (priv->attach_list) {
                g_list_foreach (priv->attach_list,
                                (GFunc) g_object_unref,


@@ -3681,7 +4127,11 @@ static const GtkActionEntry entries[] = {
         /* Edit menu */
         { "EditCopy", GTK_STOCK_COPY, NULL, "<control>C", NULL,
           G_CALLBACK (ev_window_cmd_edit_copy) },
         /* Edit menu */
         { "EditCopy", GTK_STOCK_COPY, NULL, "<control>C", NULL,
           G_CALLBACK (ev_window_cmd_edit_copy) },

-       { "EditSelectAll", NULL, N_("Select _All"), "<control>A", NULL,
+#ifdef HAVE_GTK_RECENT
+       { "EditSelectAll", GTK_STOCK_SELECT_ALL, N_("Select _All"), "<control>A", NULL,
+#else
+       { "EditSelectAll", NULL, N_("Select _All"), "<control>A", NULL,
+#endif /* HAVE_GTK_RECENT */

          G_CALLBACK (ev_window_cmd_edit_select_all) },
         { "EditFind", GTK_STOCK_FIND, N_("_Find..."), "<control>F",
           N_("Find a word or phrase in the document"),
          G_CALLBACK (ev_window_cmd_edit_select_all) },
         { "EditFind", GTK_STOCK_FIND, N_("_Find..."), "<control>F",
           N_("Find a word or phrase in the document"),


@@ -3818,8 +4268,11 @@ static const GtkActionEntry view_popup_entries [] = {
        { "OpenLinkNewWindow", NULL, N_("Open in New _Window"), NULL,
          NULL, G_CALLBACK (ev_view_popup_cmd_open_link_new_window) },
        { "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL,
        { "OpenLinkNewWindow", NULL, N_("Open in New _Window"), NULL,
          NULL, G_CALLBACK (ev_view_popup_cmd_open_link_new_window) },
        { "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL,

-         NULL,
-         G_CALLBACK (ev_view_popup_cmd_copy_link_address) },
+         NULL, G_CALLBACK (ev_view_popup_cmd_copy_link_address) },
+       { "SaveImageAs", NULL, N_("_Save Image As..."), NULL,
+         NULL, G_CALLBACK (ev_view_popup_cmd_save_image_as) },
+       { "CopyImage", NULL, N_("Copy _Image"), NULL,
+         NULL, G_CALLBACK (ev_view_popup_cmd_copy_image) },

 };
 
 static const GtkActionEntry attachment_popup_entries [] = {
 };
 
 static const GtkActionEntry attachment_popup_entries [] = {


@@ -3830,32 +4283,9 @@ static const GtkActionEntry attachment_popup_entries [] = {
 };
 
 static void
 };
 
 static void

-drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
-                      gint x, gint y, GtkSelectionData *selection_data,
-                      guint info, guint time, gpointer gdata)
+sidebar_links_link_activated_cb (EvSidebarLinks *sidebar_links, EvLink *link, EvWindow *window)

 {
 {

-       GList  *uri_list = NULL;
-       GSList *uris = NULL;
-       gchar  *uri;
-
-       uri_list = gnome_vfs_uri_list_parse ((gchar *) selection_data->data);
-
-       if (uri_list) {
-               while (uri_list) {
-                       uri = gnome_vfs_uri_to_string (uri_list->data, GNOME_VFS_URI_HIDE_NONE);
-                       uris = g_slist_append (uris, (gpointer) uri);
-                       
-                       uri_list = g_list_next (uri_list);
-               }
-
-               gnome_vfs_uri_list_free (uri_list);
-               
-               ev_application_open_uri_list (EV_APP, uris,
-                                             gtk_widget_get_screen (widget),
-                                             0);
-               
-               g_slist_free (uris);
-       }
+       ev_view_handle_link (EV_VIEW (window->priv->view), link);

 }
 
 static void
 }
 
 static void


@@ -3865,14 +4295,12 @@ activate_link_cb (EvPageAction *page_action, EvLink *link, EvWindow *window)
        gtk_widget_grab_focus (window->priv->view);
 }
 
        gtk_widget_grab_focus (window->priv->view);
 }
 

-static gboolean
-activate_label_cb (EvPageAction *page_action, char *label, EvWindow *window)
+static void
+navigation_action_activate_link_cb (EvNavigationAction *action, EvLink *link, EvWindow *window)

 {
 {

-       g_return_val_if_fail (EV_IS_WINDOW (window), FALSE);
-
+       
+       ev_view_handle_link (EV_VIEW (window->priv->view), link);

        gtk_widget_grab_focus (window->priv->view);
        gtk_widget_grab_focus (window->priv->view);

-
-       return ev_page_cache_set_page_label (window->priv->page_cache, label);

 }
 
 static void
 }
 
 static void


@@ -3888,8 +4316,6 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group)
                               NULL);
        g_signal_connect (action, "activate_link",
                          G_CALLBACK (activate_link_cb), window);
                               NULL);
        g_signal_connect (action, "activate_link",
                          G_CALLBACK (activate_link_cb), window);

-       g_signal_connect (action, "activate_label",
-                         G_CALLBACK (activate_label_cb), window);

        gtk_action_group_add_action (group, action);
        g_object_unref (action);
 
        gtk_action_group_add_action (group, action);
        g_object_unref (action);
 


@@ -3913,6 +4339,8 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group)
                               "stock_id", GTK_STOCK_GO_DOWN,
                               "tooltip", _("Move across visited pages"),
                               NULL);
                               "stock_id", GTK_STOCK_GO_DOWN,
                               "tooltip", _("Move across visited pages"),
                               NULL);

+       g_signal_connect (action, "activate_link",
+                         G_CALLBACK (navigation_action_activate_link_cb), window);

        gtk_action_group_add_action (group, action);
        g_object_unref (action);
 }
        gtk_action_group_add_action (group, action);
        g_object_unref (action);
 }


@@ -4058,24 +4486,21 @@ window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer
                        ev_page_cache_get_max_height (window->priv->page_cache, 
                                                      0, 1.0,
                                                      &document_height);                        
                        ev_page_cache_get_max_height (window->priv->page_cache, 
                                                      0, 1.0,
                                                      &document_height);                        

-                       ev_metadata_manager_set_int (uri, "window_x", x);
-                       ev_metadata_manager_set_int (uri, "window_y", y);

                        ev_metadata_manager_set_double (uri, "window_width_ratio", 
                        ev_metadata_manager_set_double (uri, "window_width_ratio", 

-                                                       (double)width/document_width);
+                                                       (double)width / document_width);

                        ev_metadata_manager_set_double (uri, "window_height_ratio", 
                        ev_metadata_manager_set_double (uri, "window_height_ratio", 

-                                                       (double)height/document_height);
+                                                       (double)height / document_height);
+                       
+                       ev_metadata_manager_set_int (uri, "window_x", x);
+                       ev_metadata_manager_set_int (uri, "window_y", y);
+                       ev_metadata_manager_set_int (uri, "window_width", width);
+                       ev_metadata_manager_set_int (uri, "window_height", height);

                }
        }
 
        return FALSE;
 }
 
                }
        }
 
        return FALSE;
 }
 

-static void
-sidebar_links_link_activated_cb (EvSidebarLinks *sidebar_links, EvLink *link, EvWindow *window)
-{
-       ev_view_handle_link (EV_VIEW (window->priv->view), link);
-}
-

 static void
 launch_action (EvWindow *window, EvLinkAction *action)
 {
 static void
 launch_action (EvWindow *window, EvLinkAction *action)
 {


@@ -4113,14 +4538,7 @@ launch_action (EvWindow *window, EvLinkAction *action)
 static void
 launch_external_uri (EvWindow *window, EvLinkAction *action)
 {
 static void
 launch_external_uri (EvWindow *window, EvLinkAction *action)
 {

-       const char *uri;
-       char *escaped;
-
-       uri = ev_link_action_get_uri (action);
-       escaped = gnome_vfs_escape_host_and_path_string (uri);
-
-       gnome_vfs_url_show (escaped);
-       g_free (escaped);
+       gnome_vfs_url_show (ev_link_action_get_uri (action));

 }
 
 static void
 }
 
 static void


@@ -4176,6 +4594,16 @@ static void
 view_external_link_cb (EvView *view, EvLinkAction *action, EvWindow *window)
 {
        switch (ev_link_action_get_action_type (action)) {
 view_external_link_cb (EvView *view, EvLinkAction *action, EvWindow *window)
 {
        switch (ev_link_action_get_action_type (action)) {

+               case EV_LINK_ACTION_TYPE_GOTO_DEST: {
+                       EvLinkDest *dest;
+                       
+                       dest = ev_link_action_get_dest (action);
+                       if (!dest)
+                               return;
+
+                       ev_window_cmd_file_open_copy_at_dest (window, dest);
+               }
+                       break;

                case EV_LINK_ACTION_TYPE_EXTERNAL_URI:
                        launch_external_uri (window, action);
                        break;
                case EV_LINK_ACTION_TYPE_EXTERNAL_URI:
                        launch_external_uri (window, action);
                        break;


@@ -4234,6 +4662,86 @@ ev_view_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window)
        gtk_clipboard_set_text (clipboard, uri, -1);
 }
 
        gtk_clipboard_set_text (clipboard, uri, -1);
 }
 

+static void
+image_save_dialog_response_cb (GtkWidget *fc,
+                              gint       response_id,
+                              EvWindow  *ev_window)
+{
+       gchar  *uri;
+       gchar  *filename;
+       GError *error = NULL;
+       
+       if (response_id != GTK_RESPONSE_OK) {
+               gtk_widget_destroy (fc);
+               return;
+       }
+
+       uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
+       filename = g_filename_from_uri (uri, NULL, NULL);
+       g_free (uri);
+       
+       /* FIXME: allow saving in other image formats than png */
+       gdk_pixbuf_save (ev_image_get_pixbuf (ev_window->priv->image),
+                        filename, "png", &error, NULL);
+       
+       if (error) {
+               ev_window_error_dialog (GTK_WINDOW (ev_window),
+                                       _("The image could not be saved."),
+                                       error);
+               g_error_free (error);
+       }
+
+       g_free (filename);
+
+       gtk_widget_destroy (fc);
+}
+
+static void
+ev_view_popup_cmd_save_image_as (GtkAction *action, EvWindow *window)
+{
+       GtkWidget     *fc;
+       GtkFileFilter *filter;
+
+       if (!window->priv->image)
+               return;
+
+       fc = gtk_file_chooser_dialog_new (_("Save Image"),
+                                         GTK_WINDOW (window),
+                                         GTK_FILE_CHOOSER_ACTION_SAVE,
+                                         GTK_STOCK_CANCEL,
+                                         GTK_RESPONSE_CANCEL,
+                                         GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+                                         NULL);
+
+       gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
+       gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (fc), TRUE);
+
+       filter = gtk_file_filter_new ();
+       gtk_file_filter_set_name (filter, _("Images"));
+       gtk_file_filter_add_pixbuf_formats (filter);
+       gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fc), filter);
+
+       g_signal_connect (fc, "response",
+                         G_CALLBACK (image_save_dialog_response_cb),
+                         window);
+
+       gtk_widget_show (fc);
+}
+
+static void
+ev_view_popup_cmd_copy_image (GtkAction *action, EvWindow *window)
+{
+       GtkClipboard *clipboard;
+
+       if (!window->priv->image)
+               return;
+       
+       clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window),
+                                             GDK_SELECTION_CLIPBOARD);
+       gtk_clipboard_set_image (clipboard,
+                                ev_image_get_pixbuf (window->priv->image));
+}
+

 static void
 ev_attachment_popup_cmd_open_attachment (GtkAction *action, EvWindow *window)
 {
 static void
 ev_attachment_popup_cmd_open_attachment (GtkAction *action, EvWindow *window)
 {


@@ -4298,7 +4806,7 @@ attachment_save_dialog_response_cb (GtkWidget *fc,
                g_free (filename);
                
                if (error) {
                g_free (filename);
                
                if (error) {

-                       ev_window_error_dialog (GTK_WINDOW (fc),
+                       ev_window_error_dialog (GTK_WINDOW (ev_window),

                                                _("The attachment could not be saved."),
                                                error);
                        g_error_free (error);
                                                _("The attachment could not be saved."),
                                                error);
                        g_error_free (error);


@@ -4323,7 +4831,7 @@ ev_attachment_popup_cmd_save_attachment_as (GtkAction *action, EvWindow *window)
                attachment = (EvAttachment *) window->priv->attach_list->data;
        
        fc = gtk_file_chooser_dialog_new (
                attachment = (EvAttachment *) window->priv->attach_list->data;
        
        fc = gtk_file_chooser_dialog_new (

-               _("Save a Copy"),
+               _("Save Attachment"),

                GTK_WINDOW (window),
                attachment ? GTK_FILE_CHOOSER_ACTION_SAVE : GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
                GTK_STOCK_CANCEL,
                GTK_WINDOW (window),
                attachment ? GTK_FILE_CHOOSER_ACTION_SAVE : GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
                GTK_STOCK_CANCEL,


@@ -4526,6 +5034,8 @@ ev_window_init (EvWindow *ev_window)
                        ev_window->priv->scrolled_window);
 
        ev_window->priv->view = ev_view_new ();
                        ev_window->priv->scrolled_window);
 
        ev_window->priv->view = ev_view_new ();

+       ev_view_set_screen_dpi (EV_VIEW (ev_window->priv->view),
+                               ev_window_get_screen_dpi (ev_window));

        ev_window->priv->password_view = ev_password_view_new ();
        g_signal_connect_swapped (ev_window->priv->password_view,
                                  "unlock",
        ev_window->priv->password_view = ev_password_view_new ();
        g_signal_connect_swapped (ev_window->priv->password_view,
                                  "unlock",


@@ -4540,6 +5050,10 @@ ev_window_init (EvWindow *ev_window)
        g_signal_connect_object (ev_window->priv->view, "external-link",
                                 G_CALLBACK (view_external_link_cb),
                                 ev_window, 0);
        g_signal_connect_object (ev_window->priv->view, "external-link",
                                 G_CALLBACK (view_external_link_cb),
                                 ev_window, 0);

+       g_signal_connect_object (ev_window->priv->view, "handle-link",
+                                G_CALLBACK (view_handle_link_cb),
+                                ev_window, 0);
+

        g_signal_connect_object (ev_window->priv->view,
                                 "popup",
                                 G_CALLBACK (view_menu_popup_cb),
        g_signal_connect_object (ev_window->priv->view,
                                 "popup",
                                 G_CALLBACK (view_menu_popup_cb),


@@ -4641,23 +5155,7 @@ ev_window_init (EvWindow *ev_window)
        /* Give focus to the document view */
        gtk_widget_grab_focus (ev_window->priv->view);
 
        /* Give focus to the document view */
        gtk_widget_grab_focus (ev_window->priv->view);
 

-       /* Drag and Drop */
-       gtk_drag_dest_unset (GTK_WIDGET (ev_window->priv->view));
-       gtk_drag_dest_set (GTK_WIDGET (ev_window->priv->view),
-                          GTK_DEST_DEFAULT_ALL,
-                          ev_drop_types,
-                          sizeof (ev_drop_types) / sizeof (ev_drop_types[0]),
-                          GDK_ACTION_COPY);
-       g_signal_connect_swapped (G_OBJECT (ev_window->priv->view), "drag-data-received",
-                                 G_CALLBACK (drag_data_received_cb),
-                                 ev_window);
-
-       /* Screensaver */
-
-       ev_window->priv->screensaver = totem_scrsaver_new ();
-

        /* Set it user interface params */
        /* Set it user interface params */

-

        ev_window_setup_recent (ev_window);
 
        setup_chrome_from_metadata (ev_window);
        ev_window_setup_recent (ev_window);
 
        setup_chrome_from_metadata (ev_window);