X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-window.c;h=dd05d662d2b88ab2f871f6d8cd9c48594e8f028f;hb=7e774cfc05a9eb30c5d011ba5229d4324052e474;hp=ffac5d7387a8da8e34f32d0a098e9dd504c0af23;hpb=1aac2d41f056e15fefd248d67b2765da3a03ca1d;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index ffac5d73..dd05d662 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -66,6 +66,7 @@
 #include "ev-history.h"
 #include "ev-image.h"
 #include "ev-message-area.h"
+#include "ev-mount-operation.h"
 
 #include <gtk/gtkprintunixdialog.h>
 
@@ -268,6 +269,8 @@ static void     find_bar_search_changed_cb              (EggFindBar       *find_
 							 GParamSpec       *param,
 							 EvWindow         *ev_window);
 static void     ev_window_do_preview_print              (EvWindow         *window);
+static void     ev_window_load_file_remote              (EvWindow         *ev_window,
+							 GFile            *source_file);
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
@@ -1072,8 +1075,6 @@ ev_window_set_icon_from_thumbnail (EvJobThumbnail *job,
 static void
 ev_window_refresh_window_thumbnail (EvWindow *ev_window, int rotation)
 {
-	
-	EvRenderContext *rc;
 	gint page_width, page_height;
 	gdouble scale;
 	EvDocument *document = ev_window->priv->document;
@@ -1089,14 +1090,11 @@ ev_window_refresh_window_thumbnail (EvWindow *ev_window, int rotation)
 				&page_width, &page_height);
 	scale = (gdouble)128 / (gdouble)page_width;
 	
-	rc = ev_render_context_new (rotation, 0, scale);
-	
-	ev_window->priv->thumbnail_job = ev_job_thumbnail_new (document, rc);
+	ev_window->priv->thumbnail_job = ev_job_thumbnail_new (document, 0, rotation, scale);
 	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);
 }
 
 static gboolean
@@ -1426,6 +1424,39 @@ ev_window_close_dialogs (EvWindow *ev_window)
 	ev_window->priv->properties = NULL;
 }
 
+static void
+ev_window_load_remote_failed (EvWindow *ev_window,
+			      GError   *error)
+{
+	ev_view_set_loading (EV_VIEW (ev_window->priv->view), FALSE);
+	ev_window->priv->in_reload = FALSE;
+	ev_window_error_message (GTK_WINDOW (ev_window),
+				 _("Unable to open document"),
+				 error);
+	g_free (ev_window->priv->local_uri);
+	ev_window->priv->local_uri = NULL;
+}
+
+static void
+mount_volume_ready_cb (GFile        *source,
+		       GAsyncResult *async_result,
+		       EvWindow     *ev_window)
+{
+	GError *error = NULL;
+
+	g_file_mount_enclosing_volume_finish (source, async_result, &error);
+
+	if (error) {
+		ev_window_load_remote_failed (ev_window, error);
+		g_object_unref (source);
+		g_error_free (error);
+	} else {
+		/* Volume successfully mounted,
+		   try opening the file again */
+		ev_window_load_file_remote (ev_window, source);
+	}
+}
+
 static void
 window_open_file_copy_ready_cb (GFile        *source,
 				GAsyncResult *async_result,
@@ -1443,19 +1474,21 @@ window_open_file_copy_ready_cb (GFile        *source,
 
 	if (error->domain == G_IO_ERROR &&
 	    error->code == G_IO_ERROR_NOT_MOUNTED) {
-		/* TODO: try to mount */
+		GMountOperation *operation;
+
+		operation = ev_mount_operation_new (GTK_WINDOW (ev_window));
+		g_file_mount_enclosing_volume (source,
+					       G_MOUNT_MOUNT_NONE,
+					       operation, NULL,
+					       (GAsyncReadyCallback)mount_volume_ready_cb,
+					       ev_window);
+		g_object_unref (operation);
+	} else {
+		ev_window_load_remote_failed (ev_window, error);
+		g_object_unref (source);
 	}
-
-	ev_view_set_loading (EV_VIEW (ev_window->priv->view), FALSE);
-	ev_window->priv->in_reload = FALSE;
-	ev_window_error_message (GTK_WINDOW (ev_window),
-				 _("Unable to open document"),
-				 error);
-	g_free (ev_window->priv->local_uri);
-	ev_window->priv->local_uri = NULL;
 	
 	g_error_free (error);
-	g_object_unref (source);
 }
 
 static void
@@ -4764,19 +4797,14 @@ ev_view_popup_cmd_open_link_new_window (GtkAction *action, EvWindow *window)
 static void
 ev_view_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window)
 {
-	GtkClipboard *clipboard;
 	EvLinkAction *ev_action;
-	const gchar *uri;
 
 	ev_action = ev_link_get_action (window->priv->link);
 	if (!ev_action)
 		return;
 
-	uri = ev_link_action_get_uri (ev_action);
-
-	clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window),
-					      GDK_SELECTION_CLIPBOARD);
-	gtk_clipboard_set_text (clipboard, uri, -1);
+	ev_view_copy_link_address (EV_VIEW (window->priv->view),
+				   ev_action);
 }