diff options
| author | Milan Crha <mcrha@redhat.com> | 2011-06-28 00:04:57 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2011-06-28 00:04:57 +0800 |
| commit | 566d861915da77e93b097a927a79f0130de8c535 (patch) | |
| tree | 62226a7396bd10080d12f0d69262251aa45e34c2 /addressbook/gui/widgets/eab-gui-util.c | |
| parent | 05933ef483635b84514eb285d4d839b87c3b3afb (diff) | |
| download | gsoc2013-evolution-566d861915da77e93b097a927a79f0130de8c535.tar gsoc2013-evolution-566d861915da77e93b097a927a79f0130de8c535.tar.gz gsoc2013-evolution-566d861915da77e93b097a927a79f0130de8c535.tar.bz2 gsoc2013-evolution-566d861915da77e93b097a927a79f0130de8c535.tar.lz gsoc2013-evolution-566d861915da77e93b097a927a79f0130de8c535.tar.xz gsoc2013-evolution-566d861915da77e93b097a927a79f0130de8c535.tar.zst gsoc2013-evolution-566d861915da77e93b097a927a79f0130de8c535.zip | |
Check for cancelled GIO operation error code too
Diffstat (limited to 'addressbook/gui/widgets/eab-gui-util.c')
| -rw-r--r-- | addressbook/gui/widgets/eab-gui-util.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 359c104c89..7b94c85233 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -441,11 +441,12 @@ contact_added_cb (EBookClient *book_client, const GError *error, const gchar *id { ContactCopyProcess *process = user_data; - if (error && !g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED)) { + if (error && !g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED) && + !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { process->book_status = FALSE; eab_error_dialog (process->alert_sink, _("Error adding contact"), error); - } - else if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED)) { + } else if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED) || + g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { process->book_status = FALSE; } else { |