sync with Hiroyuki's 0.5.0claws2-3

[claws.git] / src / send.c

diff --git a/src/send.c b/src/send.c
index 6fd12dbf32fd8fac3c70913378e5b93759a24c5a..ad182fda40a5c679af0f9db3c4f2debe47f6ebf3 100644 (file)
--- a/src/send.c
+++ b/src/send.c
@@ -55,6 +55,7 @@ struct _SendProgressDialog
 {
        ProgressDialog *dialog;
        GList *queue_list;
+       gboolean cancelled;
 };
 
 static gint send_message_smtp  (GSList *to_list, const gchar *from,
@@ -97,9 +98,8 @@ gint send_message(const gchar *file, PrefsAccount *ac_prefs, GSList *to_list)
                domain = ac_prefs->set_domain ? ac_prefs->domain : NULL;
 
                val = send_message_smtp(to_list, ac_prefs->address,
-                                       ac_prefs->smtp_server, port,
-                                       domain, ac_prefs->userid,
-                                       ac_prefs->passwd,
+                                       ac_prefs->smtp_server, port, domain,
+                                        ac_prefs->userid, ac_prefs->passwd,
                                        ac_prefs->use_smtp_auth, fp);
        }
 
@@ -233,12 +233,21 @@ gint send_message_queue(const gchar *file)
        return val;
 }
 
+#define EXIT_IF_CANCELLED() \
+{ \
+       if (dialog->cancelled) { \
+               sock_close(smtp_sock); \
+               send_progress_dialog_destroy(dialog); \
+               return -1; \
+       } \
+}
+
 #define SEND_EXIT_IF_ERROR(f, s) \
 { \
+       EXIT_IF_CANCELLED(); \
        if (!(f)) { \
                log_warning("Error occurred while %s\n", s); \
                sock_close(smtp_sock); \
-               smtp_sock = NULL; \
                send_progress_dialog_destroy(dialog); \
                return -1; \
        } \
@@ -246,12 +255,12 @@ gint send_message_queue(const gchar *file)
 
 #define SEND_EXIT_IF_NOTOK(f, s) \
 { \
+       EXIT_IF_CANCELLED(); \
        if ((f) != SM_OK) { \
                log_warning("Error occurred while %s\n", s); \
                if (smtp_quit(smtp_sock) != SM_OK) \
                        log_warning("Error occurred while sending QUIT\n"); \
                sock_close(smtp_sock); \
-               smtp_sock = NULL; \
                send_progress_dialog_destroy(dialog); \
                return -1; \
        } \
@@ -263,7 +272,7 @@ static gint send_message_smtp(GSList *to_list, const gchar *from,
                              const gchar *passwd, gboolean use_smtp_auth,
                              FILE *fp)
 {
-       SockInfo *smtp_sock;
+       SockInfo *smtp_sock = NULL;
        SendProgressDialog *dialog;
        GtkCList *clist;
        const gchar *text[3];
@@ -330,7 +339,7 @@ static gint send_message_smtp(GSList *to_list, const gchar *from,
 
                gettimeofday(&tv_cur, NULL);
                if (tv_cur.tv_sec - tv_prev.tv_sec > 0 ||
-                   tv_cur.tv_usec - tv_prev.tv_usec > 10000) {
+                   tv_cur.tv_usec - tv_prev.tv_usec > UI_REFRESH_INTERVAL) {
                        g_snprintf(str, sizeof(str),
                                   _("Sending message (%d / %d bytes)"),
                                   bytes, size);
@@ -410,6 +419,7 @@ static SendProgressDialog *send_progress_dialog_create(void)
 
        dialog->dialog = progress;
        dialog->queue_list = NULL;
+       dialog->cancelled = FALSE;
 
        return dialog;
 }
@@ -426,5 +436,5 @@ static void send_cancel(GtkWidget *widget, gpointer data)
 {
        SendProgressDialog *dialog = data;
 
-       g_print("cancelled\n");
+       dialog->cancelled = TRUE;
 }