aboutsummaryrefslogtreecommitdiffstats
path: root/src/bookmarks
diff options
context:
space:
mode:
authorCrispin Flowerday <gnome@flowerday.cx>2006-01-22 03:14:36 +0800
committerCrispin Flowerday <crispin@src.gnome.org>2006-01-22 03:14:36 +0800
commit013fd44c1e6f4941d7efd22bca75d8a9fd1353b2 (patch)
treee3345607737dde8c0a2223ed8a36452ca17a65ba /src/bookmarks
parent225c1762995be0b38aa19ff221bafd2136532b6b (diff)
downloadgsoc2013-epiphany-013fd44c1e6f4941d7efd22bca75d8a9fd1353b2.tar
gsoc2013-epiphany-013fd44c1e6f4941d7efd22bca75d8a9fd1353b2.tar.gz
gsoc2013-epiphany-013fd44c1e6f4941d7efd22bca75d8a9fd1353b2.tar.bz2
gsoc2013-epiphany-013fd44c1e6f4941d7efd22bca75d8a9fd1353b2.tar.lz
gsoc2013-epiphany-013fd44c1e6f4941d7efd22bca75d8a9fd1353b2.tar.xz
gsoc2013-epiphany-013fd44c1e6f4941d7efd22bca75d8a9fd1353b2.tar.zst
gsoc2013-epiphany-013fd44c1e6f4941d7efd22bca75d8a9fd1353b2.zip
Fix bookmark exporting, so that it can be cancelled. Fixes bug #327438
2006-01-21 Crispin Flowerday <gnome@flowerday.cx> * src/bookmarks/ephy-bookmarks-editor.c (cmd_bookmarks_export): Fix bookmark exporting, so that it can be cancelled. Fixes bug #327438
Diffstat (limited to 'src/bookmarks')
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 35841772f..9d0a3bb22 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -708,6 +708,12 @@ cmd_bookmarks_export (GtkAction *action,
response = gtk_dialog_run (GTK_DIALOG (dialog));
+ if (response != GTK_RESPONSE_ACCEPT)
+ {
+ gtk_widget_destroy (dialog);
+ return;
+ }
+
format = gtk_combo_box_get_active (GTK_COMBO_BOX (combo));
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
basename = g_path_get_basename (filename);
@@ -727,10 +733,7 @@ cmd_bookmarks_export (GtkAction *action,
}
g_free (basename);
}
- while (response == GTK_RESPONSE_ACCEPT
- && !ephy_gui_check_location_writable (GTK_WIDGET (dialog), filename));
-
- gtk_widget_destroy (dialog);
+ while (!ephy_gui_check_location_writable (GTK_WIDGET (dialog), filename));
/* 0 for ephy RDF format, 1 for mozilla HTML format */