[evolution/gnome-3-8] Do not mask CAMEL_ERROR_GENERIC in composer_send_completed()



commit 7ef82cc0df5281a03c87c828245fc34c3af2a3b0
Author: Milan Crha <mcrha redhat com>
Date:   Mon Jul 22 12:03:55 2013 +0200

    Do not mask CAMEL_ERROR_GENERIC in composer_send_completed()
    
    Any provider can return a generic error code, which makes the check
    useless, only hiding important error information from a user. Since
    the camel_getaddrinfo() returns CAMEL_SERVICE_ERROR_URL_INVALID,
    the check could be adapted and be more useful.

 mail/em-composer-utils.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 92776bc..5de7dfd 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -517,9 +517,10 @@ composer_send_completed (GObject *source_object,
                g_error_matches (
                        local_error, CAMEL_SERVICE_ERROR,
                        CAMEL_SERVICE_ERROR_UNAVAILABLE) ||
-               /* XXX camel_getaddrinfo() sets this, unfortunately. */
+               /* a name resolution failed */
                g_error_matches (
-                       local_error, CAMEL_ERROR, CAMEL_ERROR_GENERIC);
+                       local_error, CAMEL_SERVICE_ERROR,
+                       CAMEL_SERVICE_ERROR_URL_INVALID);
        if (service_unavailable) {
                /* Inform the user. */
                e_alert_run_dialog_for_args (


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