#include "procheader.h"
#include "utils.h"
#include "gtkutils.h"
+#include "statusbar.h"
+#include "inc.h"
+#include "log.h"
typedef struct _SendProgressDialog SendProgressDialog;
GList *queue_list;
gboolean cancelled;
};
+#if 0
+static gint send_message_local (const gchar *command,
+ FILE *fp);
+static gint send_message_smtp (PrefsAccount *ac_prefs,
+ GSList *to_list,
+ FILE *fp);
+#endif
+static gint send_message_data (SendProgressDialog *dialog,
+ SockInfo *sock,
+ FILE *fp,
+ gint size);
-static gint send_message_data (SendProgressDialog *dialog, SockInfo *sock,
- FILE *fp, gint size);
+static SendProgressDialog *send_progress_dialog_create (void);
+static void send_progress_dialog_destroy (SendProgressDialog *dialog);
+static void send_cancel (GtkWidget *widget,
+ gpointer data);
-static SendProgressDialog *send_progress_dialog_create(void);
-static void send_progress_dialog_destroy(SendProgressDialog *dialog);
-static void send_cancel(GtkWidget *widget, gpointer data);
+static void send_progress_dialog_update (Session *session,
+ SMTPPhase phase);
gint send_message(const gchar *file, PrefsAccount *ac_prefs, GSList *to_list)
{"AID:", NULL, FALSE},
{NULL, NULL, FALSE}};
FILE *fp;
- gint val;
+ gint val = 0;
gchar *from = NULL;
gchar *server = NULL;
GSList *to_list = NULL;
gchar buf[BUFFSIZE];
gint hnum;
- PrefsAccount *ac = NULL;
+ glong fpos;
+ PrefsAccount *ac = NULL, *mailac = NULL, *newsac = NULL;
g_return_val_if_fail(file != NULL, -1);
}
}
- if (!to_list || !from) {
+ if (((!ac || (ac && ac->protocol != A_NNTP)) && !to_list) || !from) {
g_warning(_("Queued message header is broken.\n"));
val = -1;
- } else if (ac && ac->use_mail_command && ac->mail_command &&
- (*ac->mail_command)) {
- val = send_message_local(ac->mail_command, fp);
} else if (prefs_common.use_extsend && prefs_common.extsend_cmd) {
val = send_message_local(prefs_common.extsend_cmd, fp);
} else {
- if (!ac) {
+ if (ac && ac->protocol == A_NNTP) {
+ newsac = ac;
+
+ /* search mail account */
+ mailac = account_find_from_address(from);
+ if (!mailac) {
+ if (cur_account &&
+ cur_account->protocol != A_NNTP)
+ mailac = cur_account;
+ else {
+ mailac = account_get_default();
+ if (mailac->protocol == A_NNTP)
+ mailac = NULL;
+ }
+ }
+ } else if (ac) {
+ mailac = ac;
+ } else {
ac = account_find_from_smtp_server(from, server);
if (!ac) {
g_warning(_("Account not found. "
"Using current account...\n"));
ac = cur_account;
+ if (ac && ac->protocol != A_NNTP)
+ mailac = ac;
}
}
- if (ac)
- val = send_message_smtp(ac, to_list, fp);
- else {
- PrefsAccount tmp_ac;
+ fpos = ftell(fp);
+ if (to_list) {
+ if (mailac)
+ val = send_message_smtp(mailac, to_list, fp);
+ else {
+ PrefsAccount tmp_ac;
- g_warning(_("Account not found.\n"));
+ g_warning(_("Account not found.\n"));
- memset(&tmp_ac, 0, sizeof(PrefsAccount));
- tmp_ac.address = from;
- tmp_ac.smtp_server = server;
- tmp_ac.smtpport = SMTP_PORT;
- val = send_message_smtp(&tmp_ac, to_list, fp);
+ memset(&tmp_ac, 0, sizeof(PrefsAccount));
+ tmp_ac.address = from;
+ tmp_ac.smtp_server = server;
+ tmp_ac.smtpport = SMTP_PORT;
+ val = send_message_smtp(&tmp_ac, to_list, fp);
+ }
+ }
+ if (val == 0 && newsac) {
+ fseek(fp, fpos, SEEK_SET);
+ val = news_post_stream(FOLDER(newsac->folder), fp);
}
}
while (fgets(buf, sizeof(buf), fp) != NULL) {
strretchomp(buf);
- /* escape when a dot appears on the top */
- if (buf[0] == '.')
+ if (buf[0] == '.' && buf[1] == '\0')
fputc('.', pipefp);
fputs(buf, pipefp);
fputc('\n', pipefp);
#define EXIT_IF_CANCELLED() \
{ \
+ GTK_EVENTS_FLUSH(); \
if (dialog->cancelled) { \
- if (session) \
- session_destroy(session); \
+ session_destroy(session); \
send_progress_dialog_destroy(dialog); \
return -1; \
} \
EXIT_IF_CANCELLED(); \
if (!(f)) { \
log_warning("Error occurred while %s\n", s); \
- if (session) \
- session_destroy(session); \
+ session_destroy(session); \
send_progress_dialog_destroy(dialog); \
return -1; \
} \
ac_prefs->tmp_smtp_pass = NULL; \
} \
} \
- if (smtp_quit(session->sock) != SM_OK) \
+ if (session->sock && \
+ smtp_quit(SMTP_SESSION(session)) != SM_OK) \
log_warning(_("Error occurred while sending QUIT\n")); \
session_destroy(session); \
send_progress_dialog_destroy(dialog); \
&& (ac_prefs->protocol == A_APOP || ac_prefs->protocol == A_POP3)
&& (time(NULL) - ac_prefs->last_pop_login_time) > (60 * ac_prefs->pop_before_smtp_timeout)) {
g_snprintf(buf, sizeof(buf), _("Doing POP before SMTP..."));
- log_message("%s\n", buf);
+ statusbar_puts_all(buf);
progress_dialog_set_label(dialog->dialog, buf);
gtk_clist_set_text(clist, 0, 2, _("POP before SMTP"));
GTK_EVENTS_FLUSH();
inc_pop_before_smtp(ac_prefs);
}
- g_snprintf(buf, sizeof(buf), _("Connecting to SMTP server: %s ..."),
- ac_prefs->smtp_server);
- log_message("%s\n", buf);
- progress_dialog_set_label(dialog->dialog, buf);
- gtk_clist_set_text(clist, 0, 2, _("Connecting"));
- GTK_EVENTS_FLUSH();
+ session = smtp_session_new();
+ session->data = dialog;
+ session->ui_func = (SessionUIFunc)send_progress_dialog_update;
#if USE_SSL
- SEND_EXIT_IF_ERROR((session = smtp_session_new
- (ac_prefs->smtp_server, port, domain,
- user, pass, ac_prefs->ssl_smtp)),
- "connecting to server");
+ SEND_EXIT_IF_NOTOK
+ (smtp_connect(SMTP_SESSION(session), ac_prefs->smtp_server,
+ port, domain, user, pass, ac_prefs->ssl_smtp),
+ "connecting to server");
#else
- SEND_EXIT_IF_ERROR((session = smtp_session_new
- (ac_prefs->smtp_server, port, domain,
- user, pass)),
- "connecting to server");
+ SEND_EXIT_IF_NOTOK
+ (smtp_connect(SMTP_SESSION(session), ac_prefs->smtp_server,
+ port, domain, user, pass),
+ "connecting to server");
#endif
- progress_dialog_set_label(dialog->dialog, _("Sending MAIL FROM..."));
- gtk_clist_set_text(clist, 0, 2, _("Sending"));
- GTK_EVENTS_FLUSH();
+ if (user) {
+ SEND_EXIT_IF_NOTOK(smtp_auth(SMTP_SESSION(session),
+ ac_prefs->smtp_auth_type),
+ "authenticating");
+ }
SEND_EXIT_IF_NOTOK
- (smtp_from(SMTP_SESSION(session), ac_prefs->address,
- ac_prefs->smtp_auth_type),
+ (smtp_from(SMTP_SESSION(session), ac_prefs->address),
"sending MAIL FROM");
- progress_dialog_set_label(dialog->dialog, _("Sending RCPT TO..."));
- GTK_EVENTS_FLUSH();
-
for (cur = to_list; cur != NULL; cur = cur->next)
- SEND_EXIT_IF_NOTOK(smtp_rcpt(session->sock, (gchar *)cur->data),
+ SEND_EXIT_IF_NOTOK(smtp_rcpt(SMTP_SESSION(session),
+ (gchar *)cur->data),
"sending RCPT TO");
- progress_dialog_set_label(dialog->dialog, _("Sending DATA..."));
- GTK_EVENTS_FLUSH();
-
- SEND_EXIT_IF_NOTOK(smtp_data(session->sock), "sending DATA");
+ SEND_EXIT_IF_NOTOK(smtp_data(SMTP_SESSION(session)), "sending DATA");
/* send main part */
SEND_EXIT_IF_ERROR
"sending data");
progress_dialog_set_label(dialog->dialog, _("Quitting..."));
+ statusbar_puts_all(_("Quitting..."));
GTK_EVENTS_FLUSH();
- SEND_EXIT_IF_NOTOK(smtp_eom(session->sock), "terminating data");
- SEND_EXIT_IF_NOTOK(smtp_quit(session->sock), "sending QUIT");
+ SEND_EXIT_IF_NOTOK(smtp_eom(SMTP_SESSION(session)), "terminating data");
+ SEND_EXIT_IF_NOTOK(smtp_quit(SMTP_SESSION(session)), "sending QUIT");
+
+ statusbar_pop_all();
session_destroy(session);
send_progress_dialog_destroy(dialog);
_("Sending message (%d / %d bytes)"), \
bytes, size); \
progress_dialog_set_label(dialog->dialog, str); \
+ statusbar_puts_all(str); \
progress_dialog_set_percentage \
(dialog->dialog, (gfloat)bytes / (gfloat)size); \
GTK_EVENTS_FLUSH(); \
progress_dialog_set_value(progress, 0.0);
- gtk_widget_show_now(progress->window);
-
+ if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
+ gtk_widget_show_now(progress->window);
+ }
+
dialog->dialog = progress;
dialog->queue_list = NULL;
dialog->cancelled = FALSE;
static void send_progress_dialog_destroy(SendProgressDialog *dialog)
{
g_return_if_fail(dialog != NULL);
-
- progress_dialog_destroy(dialog->dialog);
+ if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
+ progress_dialog_destroy(dialog->dialog);
+ }
g_free(dialog);
}
dialog->cancelled = TRUE;
}
+
+static void send_progress_dialog_update(Session *session, SMTPPhase phase)
+{
+ gchar buf[BUFFSIZE];
+ gchar *state_str = NULL;
+ SendProgressDialog *dialog = (SendProgressDialog *)session->data;
+
+ switch (phase) {
+ case SMTP_CONNECT:
+ g_snprintf(buf, sizeof(buf),
+ _("Connecting to SMTP server: %s ..."),
+ session->server);
+ state_str = _("Connecting");
+ log_message("%s\n", buf);
+ break;
+ case SMTP_HELO:
+ g_snprintf(buf, sizeof(buf), _("Sending HELO..."));
+ state_str = _("Authenticating");
+ break;
+ case SMTP_EHLO:
+ g_snprintf(buf, sizeof(buf), _("Sending EHLO..."));
+ state_str = _("Authenticating");
+ break;
+ case SMTP_AUTH:
+ g_snprintf(buf, sizeof(buf), _("Authenticating..."));
+ state_str = _("Authenticating");
+ break;
+ case SMTP_FROM:
+ g_snprintf(buf, sizeof(buf), _("Sending MAIL FROM..."));
+ state_str = _("Sending");
+ break;
+ case SMTP_RCPT:
+ g_snprintf(buf, sizeof(buf), _("Sending RCPT TO..."));
+ state_str = _("Sending");
+ break;
+ case SMTP_DATA:
+ case SMTP_EOM:
+ g_snprintf(buf, sizeof(buf), _("Sending DATA..."));
+ state_str = _("Sending");
+ break;
+ case SMTP_QUIT:
+ g_snprintf(buf, sizeof(buf), _("Quitting..."));
+ state_str = _("Quitting");
+ break;
+ default:
+ return;
+ }
+
+ progress_dialog_set_label(dialog->dialog, buf);
+ gtk_clist_set_text(GTK_CLIST(dialog->dialog->clist), 0, 2, state_str);
+ GTK_EVENTS_FLUSH();
+}
projects / claws.git / blobdiff