sync with 0.9.11cvs17 HEAD

[claws.git] / src / send_message.c

diff --git a/src/send_message.c b/src/send_message.c
index 8b6781124fb708471995b4a9df9cfaddc507ffc8..0532f15cea1e1c9d99b2bd234e18013a5f363ed1 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -414,6 +414,7 @@ gint send_message_smtp(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp)
                ret = -1;
        } else if (session->state == SESSION_ERROR ||
                   session->state == SESSION_EOF ||
+                  session->state == SESSION_TIMEOUT ||
                   SMTP_SESSION(session)->state == SMTP_ERROR ||
                   SMTP_SESSION(session)->error_val != SM_OK)
                ret = -1;
@@ -594,13 +595,22 @@ static void send_put_error(Session *session)
                        err_msg = g_strdup(log_msg);
                break;
        default:
-               if (session->state == SESSION_ERROR) {
+               switch (session->state) {
+               case SESSION_ERROR:
                        log_msg =
                                _("Error occurred while sending the message.");
                        err_msg = g_strdup(log_msg);
-               } else if (session->state == SESSION_EOF) {
+                       break;
+               case SESSION_EOF:
                        log_msg = _("Connection closed by the remote host.");
                        err_msg = g_strdup(log_msg);
+                       break;
+               case SESSION_TIMEOUT:
+                       log_msg = _("Session timed out.");
+                       err_msg = g_strdup(log_msg);
+                       break;
+               default:
+                       break;
                }
                break;
        }