[evolution/gnome-3-16] Ignore "Service unavailable" errors in Send/Receive routines

[Milan Crha <mcrha src gnome org>]

commit 39c654e9fd0889a9abd97b08afa8ab05d611c455
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jun 25 14:39:44 2015 +0200

    Ignore "Service unavailable" errors in Send/Receive routines
    
    That will hide 'You must be working online to complete this operation"
    errors from user interface, when hit during regular (or manually
    invoked) account updates.

 mail/mail-send-recv.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 9d6fd62..4d3faf8 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -513,6 +513,10 @@ report_error_to_ui (CamelService *service,
        g_return_if_fail (CAMEL_IS_SERVICE (service));
        g_return_if_fail (error != NULL);
 
+       /* Ignore 'offline' errors */
+       if (g_error_matches (error, CAMEL_SERVICE_ERROR, CAMEL_SERVICE_ERROR_UNAVAILABLE))
+               return;
+
        if (folder_name) {
                tmp = g_strdup_printf ("%s: %s",
                        camel_service_get_display_name (service),
@@ -1240,10 +1244,14 @@ refresh_folders_exec (struct _refresh_folders_msg *m,
                        m->info->cancellable, "cancelled",
                        G_CALLBACK (main_op_cancelled_cb), cancellable);
 
-       success = camel_service_connect_sync (
-               CAMEL_SERVICE (m->store), cancellable, error);
-       if (!success)
+       success = camel_service_connect_sync (CAMEL_SERVICE (m->store), cancellable, &local_error);
+       if (!success) {
+               if (g_error_matches (local_error, CAMEL_SERVICE_ERROR, CAMEL_SERVICE_ERROR_UNAVAILABLE))
+                       g_clear_error (&local_error);
+               else
+                       g_propagate_error (error, local_error);
                goto exit;
+       }
 
        get_folders (m->store, m->folders, m->finfo);