[evolution-data-server] [imapx_server_inactivity_thread] Do not claim 'cancelled' error on console



commit 859fc2d52fe0f6a7590df4995691dbd4f70682bf
Author: Milan Crha <mcrha redhat com>
Date:   Wed Aug 5 15:48:38 2015 +0200

    [imapx_server_inactivity_thread] Do not claim 'cancelled' error on console

 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 a02dd18..924a523 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");
        }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]