/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 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
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include "inputdialog.h"
#include "alertpanel.h"
#include "manage_window.h"
+#include "logwindow.h"
#include "socket.h"
#include "utils.h"
#include "gtkutils.h"
gboolean cancelled;
};
+static SendProgressDialog *send_dialog = NULL;
+
static gint send_recv_message (Session *session,
const gchar *msg,
gpointer data);
static SendProgressDialog *send_progress_dialog_create(void);
static void send_progress_dialog_destroy(SendProgressDialog *dialog);
+static void send_showlog_button_cb (GtkWidget *widget,
+ gpointer data);
static void send_cancel_button_cb (GtkWidget *widget,
gpointer data);
static void send_put_error (Session *session);
+void send_cancel(void)
+{
+ if (send_dialog)
+ send_cancel_button_cb(NULL, send_dialog);
+}
+
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");
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);
Session *session;
SMTPSession *smtp_session;
gushort port = 0;
- SendProgressDialog *dialog;
gchar buf[BUFFSIZE];
gint ret = 0;
gboolean was_inited = FALSE;
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. */
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 {
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;
port = ac_prefs->set_smtpport ? ac_prefs->smtpport : SMTP_PORT;
#endif
- dialog = send_progress_dialog_create();
- dialog->session = session;
- smtp_session->dialog = dialog;
+ send_dialog = send_progress_dialog_create();
+ send_dialog->session = session;
+ smtp_session->dialog = send_dialog;
- progress_dialog_list_set(dialog->dialog, 0, NULL,
+ progress_dialog_list_set(send_dialog->dialog, 0, NULL,
ac_prefs->smtp_server,
_("Connecting"));
&& (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(LOG_PROTOCOL, "%s\n", buf);
- progress_dialog_set_label(dialog->dialog, buf);
- progress_dialog_list_set_status(dialog->dialog, 0, _("POP before SMTP"));
+ progress_dialog_set_label(send_dialog->dialog, buf);
+ progress_dialog_list_set_status(send_dialog->dialog, 0, _("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);
- progress_dialog_set_label(dialog->dialog, buf);
+ g_snprintf(buf, sizeof(buf), _("Account '%s': Connecting to SMTP server: %s:%d..."),
+ ac_prefs->account_name, ac_prefs->smtp_server, port);
+ progress_dialog_set_label(send_dialog->dialog, buf);
log_message(LOG_PROTOCOL, "%s\n", buf);
- session_set_recv_message_notify(session, send_recv_message, dialog);
+ session_set_recv_message_notify(session, send_recv_message, send_dialog);
session_set_send_data_progressive_notify
- (session, send_send_data_progressive, dialog);
- session_set_send_data_notify(session, send_send_data_finished, dialog);
+ (session, send_send_data_progressive, send_dialog);
+ session_set_send_data_notify(session, send_send_data_finished, send_dialog);
} else {
/* everything is ready to start at MAIL FROM:, just
ac_prefs->session = NULL;
smtp_session = SMTP_SESSION(session);
smtp_session->state = SMTP_HELO;
- dialog = (SendProgressDialog *)smtp_session->dialog;
+ send_dialog = (SendProgressDialog *)smtp_session->dialog;
was_inited = TRUE;
}
/* connect if necessary */
if (!was_inited && session_connect(session, ac_prefs->smtp_server, port) < 0) {
session_destroy(session);
- send_progress_dialog_destroy(dialog);
+ send_progress_dialog_destroy(send_dialog);
ac_prefs->session = NULL;
return -1;
}
smtp_from(smtp_session);
}
- while (session_is_connected(session) && dialog->cancelled == FALSE
+ while (session_is_running(session) && send_dialog->cancelled == FALSE
&& SMTP_SESSION(session)->state != SMTP_MAIL_SENT_OK)
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) {
SMTP_SESSION(session)->state == SMTP_ERROR ||
SMTP_SESSION(session)->error_val != SM_OK)
ret = -1;
- else if (dialog->cancelled == TRUE)
+ else if (send_dialog->cancelled == TRUE)
ret = -1;
if (ret == -1) {
- manage_window_focus_in(dialog->dialog->window, NULL, NULL);
+ manage_window_focus_in(send_dialog->dialog->window, NULL, NULL);
send_put_error(session);
- manage_window_focus_out(dialog->dialog->window, NULL, NULL);
+ manage_window_focus_out(send_dialog->dialog->window, NULL, NULL);
}
/* if we should close the connection, let's do it.
if (!keep_session || ret != 0) {
if (session_is_connected(session))
smtp_quit(smtp_session);
- while (session_is_connected(session) && !dialog->cancelled)
+ while (session_is_connected(session) && !send_dialog->cancelled)
gtk_main_iteration();
session_destroy(session);
ac_prefs->session = NULL;
- send_progress_dialog_destroy(dialog);
+ send_progress_dialog_destroy(send_dialog);
} else {
g_free(smtp_session->from);
g_free(smtp_session->send_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:
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)
progress_dialog_set_fraction
(dialog->dialog, (total_len == 0) ? 0 : (gfloat)cur_len / (gfloat)total_len);
- if (mainwin)
+ if (mainwin) {
+ if (!gtk_widget_get_visible(mainwin->progressbar))
+ gtk_widget_show(mainwin->progressbar);
gtk_progress_bar_set_fraction
(GTK_PROGRESS_BAR(mainwin->progressbar),
(total_len == 0) ? 0 : (gfloat)cur_len / (gfloat)total_len);
+ }
return 0;
}
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)
+ if (mainwin) {
+ gtk_widget_hide(mainwin->progressbar);
gtk_progress_bar_set_fraction
(GTK_PROGRESS_BAR(mainwin->progressbar),(gfloat)0);
+ }
return 0;
}
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;
progress = progress_dialog_create();
gtk_window_set_title(GTK_WINDOW(progress->window),
_("Sending message"));
+ g_signal_connect(G_OBJECT(progress->showlog_btn), "clicked",
+ G_CALLBACK(send_showlog_button_cb), dialog);
g_signal_connect(G_OBJECT(progress->cancel_btn), "clicked",
G_CALLBACK(send_cancel_button_cb), dialog);
g_signal_connect(G_OBJECT(progress->window), "delete_event",
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);
}
g_free(dialog);
+ dialog = NULL;
+}
+
+static void send_showlog_button_cb(GtkWidget *widget, gpointer data)
+{
+ MainWindow *mainwin = mainwindow_get_mainwindow();
+
+ log_window_show(mainwin->logwin);
}
static void send_cancel_button_cb(GtkWidget *widget, gpointer data)
{
SendProgressDialog *dialog = (SendProgressDialog *)data;
+ statusbar_progress_all(0,0,0);
dialog->cancelled = TRUE;
}
case SESSION_TIMEOUT:
log_msg = _("Session timed out. You may be able to "
"recover by increasing the timeout value in "
- "Preferences/Other.");
+ "Preferences/Other/Miscellaneous.");
err_msg = g_strdup(log_msg);
break;
default:
projects / claws.git / blobdiff