aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Kalmbach <kalmbach@gmail.com>2010-01-21 09:05:57 +0800
committerGustavo Noronha Silva <gns@gnome.org>2010-01-21 09:05:57 +0800
commitf007602b631fee9ac23c909abb75bd606f501a4f (patch)
treef1c7213a0aab9b911f7cfbfc2bb3ac0256135404
parent5bdd1efcf21639132a181e121a626913f6dfc38c (diff)
downloadgsoc2013-epiphany-f007602b631fee9ac23c909abb75bd606f501a4f.tar
gsoc2013-epiphany-f007602b631fee9ac23c909abb75bd606f501a4f.tar.gz
gsoc2013-epiphany-f007602b631fee9ac23c909abb75bd606f501a4f.tar.bz2
gsoc2013-epiphany-f007602b631fee9ac23c909abb75bd606f501a4f.tar.lz
gsoc2013-epiphany-f007602b631fee9ac23c909abb75bd606f501a4f.tar.xz
gsoc2013-epiphany-f007602b631fee9ac23c909abb75bd606f501a4f.tar.zst
gsoc2013-epiphany-f007602b631fee9ac23c909abb75bd606f501a4f.zip
Ask for confirmation when replacing files, in save as
Bug #605480
-rw-r--r--embed/ephy-web-view.c10
-rw-r--r--src/window-commands.c2
2 files changed, 8 insertions, 4 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 62bad1ec0..27eddbac0 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -3410,10 +3410,12 @@ ephy_web_view_save_sub_resources (EphyWebView *view, const char *uri, GList *sub
file = g_file_new_for_uri (destination_uri);
if (!g_file_make_directory (file, NULL, &error)) {
- g_warning ("Could not create directory: %s", error->message);
- g_error_free (error);
- g_object_unref (file);
- return;
+ if (error->code != G_IO_ERROR_EXISTS) {
+ g_warning ("Could not create directory: %s", error->message);
+ g_error_free (error);
+ g_object_unref (file);
+ return;
+ }
}
g_object_unref (file);
diff --git a/src/window-commands.c b/src/window-commands.c
index e4c799897..d26331bad 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -337,6 +337,8 @@ window_cmd_file_save_as (GtkAction *action,
CONF_STATE_SAVE_DIR,
EPHY_FILE_FILTER_ALL_SUPPORTED);
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+
g_signal_connect (dialog, "response",
G_CALLBACK (save_response_cb), embed);