diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 11 |
2 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,10 @@ +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 + 2006-01-21 Christian Persch <chpe@cvs.gnome.org> * src/window-commands.c: (window_cmd_help_about): 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 */ |