aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/gui/widgets/eab-gui-util.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 37aecf71cb..b31265ff39 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-01 Sivaiah Nallagatla <snallagatla@novell.com>
+
+ * gui/widgets/eab-gui-util.c
+ (added_cb) (_modified_cb) : Don't show
+ error dialogs when status code is E_BOOK_ERROR_CANCELLED. We don't
+ wabt to show "Error adding contact, Cancelled" dialogs when user
+ cancels duplicated contact detected dialog.
+
2004-10-27 Andre Klapper <a9016009@gmx.de>
* tools/evolution-addressbook-export.c:
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index a1715c86fd..a88bd4cf82 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -166,7 +166,7 @@ added_cb (EBook* book, EBookStatus status, EContact *contact,
{
gboolean is_list = GPOINTER_TO_INT (data);
- if (status != E_BOOK_ERROR_OK) {
+ if (status != E_BOOK_ERROR_OK && status != E_BOOK_ERROR_CANCELLED) {
eab_error_dialog (is_list ? _("Error adding list") : _("Error adding contact"), status);
}
}
@@ -177,7 +177,7 @@ modified_cb (EBook* book, EBookStatus status, EContact *contact,
{
gboolean is_list = GPOINTER_TO_INT (data);
- if (status != E_BOOK_ERROR_OK) {
+ if (status != E_BOOK_ERROR_OK && status != E_BOOK_ERROR_CANCELLED) {
eab_error_dialog (is_list ? _("Error modifying list") : _("Error modifying contact"),
status);
}