projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2009-05-19 [paul] 3.7.1cvs58
[claws.git] / src / send_message.c
diff --git a/src/send_message.c b/src/send_message.c
index 72b5b6a7681f23558cc5c48414d60504f9329df6..2dffc490ea77a6b8513b2dc7ee654dd7366350e4 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,9 +25,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
@@ -89,9 +87,9 @@ gint send_message(const gchar *file, PrefsAccount *ac_prefs, GSList *to_list)
        FILE *fp;
        gint val;
 
-       g_return_val_if_fail(file != NULL, -1);
-       g_return_val_if_fail(ac_prefs != NULL, -1);
-       g_return_val_if_fail(to_list != NULL, -1);
+       cm_return_val_if_fail(file != NULL, -1);
+       cm_return_val_if_fail(ac_prefs != NULL, -1);
+       cm_return_val_if_fail(to_list != NULL, -1);
 
        if ((fp = g_fopen(file, "rb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
@@ -131,8 +129,8 @@ gint send_message_local(const gchar *command, FILE *fp)
        gboolean err = FALSE;
        gint status;
 
-       g_return_val_if_fail(command != NULL, -1);
-       g_return_val_if_fail(fp != NULL, -1);
+       cm_return_val_if_fail(command != NULL, -1);
+       cm_return_val_if_fail(fp != NULL, -1);
 
        log_message(LOG_PROTOCOL, _("Sending message using command: %s\n"), command);
 
@@ -207,11 +205,11 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
        long fp_pos = 0;
        gchar spec_from[BUFFSIZE];
 
-       g_return_val_if_fail(ac_prefs != NULL, -1);
-       g_return_val_if_fail(ac_prefs->address != NULL, -1);
-       g_return_val_if_fail(ac_prefs->smtp_server != NULL, -1);
-       g_return_val_if_fail(to_list != NULL, -1);
-       g_return_val_if_fail(fp != NULL, -1);
+       cm_return_val_if_fail(ac_prefs != NULL, -1);
+       cm_return_val_if_fail(ac_prefs->address != NULL, -1);
+       cm_return_val_if_fail(ac_prefs->smtp_server != NULL, -1);
+       cm_return_val_if_fail(to_list != NULL, -1);
+       cm_return_val_if_fail(fp != NULL, -1);
 
        /* get the From address used, not necessarily the ac_prefs',
         * because it's editable. */
@@ -232,7 +230,7 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
 
        if (!ac_prefs->session) {
                /* we can't reuse a previously initialised session */
-               session = smtp_session_new();
+               session = smtp_session_new(ac_prefs);
                smtp_session = SMTP_SESSION(session);
 
                if (ac_prefs->set_domain && ac_prefs->domain && strlen(ac_prefs->domain)) {
@@ -248,39 +246,31 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
                                if (ac_prefs->smtp_passwd)
                                        smtp_session->pass =
                                                g_strdup(ac_prefs->smtp_passwd);
-                               else if (ac_prefs->tmp_smtp_pass)
-                                       smtp_session->pass =
-                                               g_strdup(ac_prefs->tmp_smtp_pass);
                                else {
                                        smtp_session->pass =
-                                               input_dialog_query_password
+                                               input_dialog_query_password_keep
                                                        (ac_prefs->smtp_server,
-                                                        smtp_session->user);
+                                                        smtp_session->user,
+                                                        &(ac_prefs->session_smtp_passwd));
                                        if (!smtp_session->pass) {
                                                session_destroy(session);
                                                return -1;
                                        }
-                                       ac_prefs->tmp_smtp_pass =
-                                               g_strdup(smtp_session->pass);
                                }
                        } else {
                                smtp_session->user = g_strdup(ac_prefs->userid);
                                if (ac_prefs->passwd)
                                        smtp_session->pass = g_strdup(ac_prefs->passwd);
-                               else if (ac_prefs->tmp_pass)
-                                       smtp_session->pass =
-                                               g_strdup(ac_prefs->tmp_pass);
                                else {
                                        smtp_session->pass =
-                                               input_dialog_query_password
+                                               input_dialog_query_password_keep
                                                        (ac_prefs->smtp_server,
-                                                        smtp_session->user);
+                                                        smtp_session->user,
+                                                        &(ac_prefs->session_smtp_passwd));
                                        if (!smtp_session->pass) {
                                                session_destroy(session);
                                                return -1;
                                        }
-                                       ac_prefs->tmp_pass =
-                                               g_strdup(smtp_session->pass);
                                }
                        }
                } else {
@@ -288,7 +278,7 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
                        smtp_session->pass = NULL;
                }
 
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
                port = ac_prefs->set_smtpport ? ac_prefs->smtpport :
                        ac_prefs->ssl_smtp == SSL_TUNNEL ? SSMTP_PORT : SMTP_PORT;
                session->ssl_type = ac_prefs->ssl_smtp;
@@ -383,12 +373,9 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
                gtk_main_iteration();
 
        if (SMTP_SESSION(session)->error_val == SM_AUTHFAIL) {
-               if (ac_prefs->smtp_userid && ac_prefs->tmp_smtp_pass) {
-                       g_free(ac_prefs->tmp_smtp_pass);
-                       ac_prefs->tmp_smtp_pass = NULL;
-               } else if (ac_prefs->tmp_pass) {
-                       g_free(ac_prefs->tmp_pass);
-                       ac_prefs->tmp_pass = NULL;
+               if (ac_prefs->session_smtp_passwd) {
+                       g_free(ac_prefs->session_smtp_passwd);
+                       ac_prefs->session_smtp_passwd = NULL;
                }
                ret = -1;
        } else if (SMTP_SESSION(session)->state == SMTP_MAIL_SENT_OK) {
@@ -452,7 +439,7 @@ static gint send_recv_message(Session *session, const gchar *msg, gpointer data)
        SendProgressDialog *dialog = (SendProgressDialog *)data;
        gchar *state_str = NULL;
 
-       g_return_val_if_fail(dialog != NULL, -1);
+       cm_return_val_if_fail(dialog != NULL, -1);
 
        switch (smtp_session->state) {
        case SMTP_READY:
@@ -509,7 +496,7 @@ static gint send_send_data_progressive(Session *session, guint cur_len,
        SendProgressDialog *dialog = (SendProgressDialog *)data;
        MainWindow *mainwin = mainwindow_get_mainwindow();
        
-       g_return_val_if_fail(dialog != NULL, -1);
+       cm_return_val_if_fail(dialog != NULL, -1);
 
        if (SMTP_SESSION(session)->state != SMTP_SEND_DATA &&
            SMTP_SESSION(session)->state != SMTP_EOM)
@@ -534,7 +521,7 @@ static gint send_send_data_finished(Session *session, guint len, gpointer data)
        SendProgressDialog *dialog = (SendProgressDialog *)data;
        MainWindow *mainwin = mainwindow_get_mainwindow();
 
-       g_return_val_if_fail(dialog != NULL, -1);
+       cm_return_val_if_fail(dialog != NULL, -1);
 
        send_send_data_progressive(session, len, len, dialog);
        if (mainwin)
@@ -547,7 +534,7 @@ static gint send_send_data_finished(Session *session, guint len, gpointer data)
 static void send_progress_dialog_size_allocate_cb(GtkWidget *widget,
                                         GtkAllocation *allocation)
 {
-       g_return_if_fail(allocation != NULL);
+       cm_return_if_fail(allocation != NULL);
 
        prefs_common.sendwin_width = allocation->width;
        prefs_common.sendwin_height = allocation->height;
@@ -596,7 +583,7 @@ static SendProgressDialog *send_progress_dialog_create(void)
 
 static void send_progress_dialog_destroy(SendProgressDialog *dialog)
 {
-       g_return_if_fail(dialog != NULL);
+       cm_return_if_fail(dialog != NULL);
        if (!prefs_common.send_dialog_invisible) {
                progress_dialog_destroy(dialog->dialog);
        }
@@ -606,6 +593,7 @@ static void send_progress_dialog_destroy(SendProgressDialog *dialog)
 static void send_cancel_button_cb(GtkWidget *widget, gpointer data)
 {
        SendProgressDialog *dialog = (SendProgressDialog *)data;
+       statusbar_progress_all(0,0,0);
 
        dialog->cancelled = TRUE;
 }
@@ -649,7 +637,9 @@ static void send_put_error(Session *session)
                        err_msg = g_strdup(log_msg);
                        break;
                case SESSION_TIMEOUT:
-                       log_msg = _("Session timed out.");
+                       log_msg = _("Session timed out. You may be able to "
+                                   "recover by increasing the timeout value in "
+                                   "Preferences/Other/Miscellaneous.");
                        err_msg = g_strdup(log_msg);
                        break;
                default:
Claws Mail