diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/ephy-shell.c | 26 |
2 files changed, 24 insertions, 8 deletions
@@ -1,5 +1,11 @@ 2003-02-08 Xan Lopez <xan@masilla.org> + * src/ephy-shell.c: + + Error handling in Mozilla bookmarks import. + +2003-02-08 Xan Lopez <xan@masilla.org> + * embed/mozilla/StartHereProtocolHandler.cpp: Fix mozilla bookmarks import (no, really). diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 9f903c500..8d8e461e8 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -135,14 +135,24 @@ ephy_shell_command_cb (EphyEmbedShell *shell, if (strcmp (command, "import-mozilla-bookmarks") == 0) { - ephy_bookmarks_import_mozilla (bookmarks, param); - - dialog = gtk_message_dialog_new - (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - _("Bookmarks imported successfully.")); + if (ephy_bookmarks_import_mozilla (bookmarks, param)) + { + dialog = gtk_message_dialog_new + (NULL, + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("Mozilla bookmarks imported successfully.")); + } + else + { + dialog = gtk_message_dialog_new + (NULL, + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("Importing Mozilla bookmarks failed.")); + } gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } |