Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorCarlos Garcia Campos <carlosgc@gnome.org>2009-11-06 12:37:07 (GMT)
committer Carlos Garcia Campos <carlosgc@gnome.org>2009-11-06 12:37:07 (GMT)
commitc93a4600cd131defae675a19604990cb4dc32cb3 (patch)
treeb8de72b39ff97c7ac12a3c831e93bc60f70df773 /shell
parentd59576191a18f442ef65b9ff7ec61449f4329257 (diff)
[shell] Fix loading of remote files
It was broken by the temp file handling rework
Diffstat (limited to 'shell')
-rw-r--r--shell/ev-window.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 6f98711..54be8b7 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -1718,7 +1718,7 @@ ev_window_load_file_remote (EvWindow *ev_window,
* it helps to resolve some mime types, say cbz.
*/
base_name = g_file_get_basename (source_file);
- template = g_build_filename ("document.XXXXXX-%s", base_name, NULL);
+ template = g_strdup_printf ("document.XXXXXX-%s", base_name);
g_free (base_name);
tmp_file = ev_mkstemp_file (template, &err);
@@ -1740,7 +1740,8 @@ ev_window_load_file_remote (EvWindow *ev_window,
target_file = g_file_new_for_uri (ev_window->priv->local_uri);
g_file_copy_async (source_file, target_file,
- 0, G_PRIORITY_DEFAULT,
+ G_FILE_COPY_OVERWRITE,
+ G_PRIORITY_DEFAULT,
ev_window->priv->progress_cancellable,
(GFileProgressCallback)window_open_file_copy_progress_cb,
ev_window,