diff options
| author | Milan Crha <mcrha@redhat.com> | 2011-06-28 00:04:57 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:42:34 +0800 |
| commit | adc1173159d4d5d953340f8f3c813681007de524 (patch) | |
| tree | 8a0bfc8e9a11e3489f4def2bbb7fe0a4bd645aa2 /addressbook/gui/contact-editor/e-contact-editor.c | |
| parent | 8894b72f2045388990b5696f3e8db97b9544ccf4 (diff) | |
| download | gsoc2013-evolution-adc1173159d4d5d953340f8f3c813681007de524.tar gsoc2013-evolution-adc1173159d4d5d953340f8f3c813681007de524.tar.gz gsoc2013-evolution-adc1173159d4d5d953340f8f3c813681007de524.tar.bz2 gsoc2013-evolution-adc1173159d4d5d953340f8f3c813681007de524.tar.lz gsoc2013-evolution-adc1173159d4d5d953340f8f3c813681007de524.tar.xz gsoc2013-evolution-adc1173159d4d5d953340f8f3c813681007de524.tar.zst gsoc2013-evolution-adc1173159d4d5d953340f8f3c813681007de524.zip | |
Check for cancelled GIO operation error code too
Diffstat (limited to 'addressbook/gui/contact-editor/e-contact-editor.c')
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 4088837f90..7730f17a53 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -213,7 +213,8 @@ e_contact_editor_contact_added (EABEditor *editor, if (!error) return; - if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED)) + if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED) || + g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) return; eab_error_dialog (NULL, _("Error adding contact"), error); @@ -227,7 +228,8 @@ e_contact_editor_contact_modified (EABEditor *editor, if (!error) return; - if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED)) + if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED) || + g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) return; eab_error_dialog (NULL, _("Error modifying contact"), error); @@ -241,7 +243,8 @@ e_contact_editor_contact_deleted (EABEditor *editor, if (!error) return; - if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED)) + if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED) || + g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) return; eab_error_dialog (NULL, _("Error removing contact"), error); @@ -2983,8 +2986,8 @@ contact_editor_book_loaded_cb (GObject *source_object, if (!e_client_utils_open_new_finish (source, result, &client, &error)) client = NULL; - if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) || - g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED)) { + if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED) || + g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { g_warn_if_fail (client == NULL); g_error_free (error); } else if (error != NULL) { |