diff options
| author | Milan Crha <mcrha@redhat.com> | 2015-08-05 15:48:38 +0200 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2015-08-05 15:49:21 +0200 |
| commit | 859fc2d52fe0f6a7590df4995691dbd4f70682bf (patch) | |
| tree | 860413c0d03fed3dbf2f72d36dfce8a5c3886c1b /camel | |
| parent | 5f9e4ec93e708d59a0bfaff9fdd6ba7dab38e764 (diff) | |
| download | evolution-data-server-859fc2d52fe0f6a7590df4995691dbd4f70682bf.tar.gz | |
[imapx_server_inactivity_thread] Do not claim 'cancelled' error on console
Diffstat (limited to 'camel')
| -rw-r--r-- | camel/providers/imapx/camel-imapx-server.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c index a02dd1859..924a52390 100644 --- a/camel/providers/imapx/camel-imapx-server.c +++ b/camel/providers/imapx/camel-imapx-server.c @@ -651,11 +651,13 @@ imapx_server_inactivity_thread (gpointer user_data) if (imapx_in_idle (is)) { /* Stop and restart the IDLE command. */ - if (!camel_imapx_server_schedule_idle_sync (is, NULL, is->priv->cancellable, &local_error)) { - g_warning ("%s: Faield to restart IDLE: %s", G_STRFUNC, local_error ? local_error->message : "Unknown error"); + if (!camel_imapx_server_schedule_idle_sync (is, NULL, is->priv->cancellable, &local_error) && + !g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { + g_warning ("%s: Failed to restart IDLE: %s", G_STRFUNC, local_error ? local_error->message : "Unknown error"); } } else { - if (!camel_imapx_server_noop_sync (is, NULL, is->priv->cancellable, &local_error)) + if (!camel_imapx_server_noop_sync (is, NULL, is->priv->cancellable, &local_error) && + !g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) g_warning ("%s: Failed to issue NOOP: %s", G_STRFUNC, local_error ? local_error->message : "Unknown error"); } |