X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fsend_message.c;h=393515410eaa2b08127405c98dee877ae4099005;hp=466ddad9a7e05af34b15a66db6f69e43bae54b67;hb=37460fff49d88a6d5ccac2f9605268d1af0075f9;hpb=03ba23857fee0976b454cd5b5cc8c6c4038fc0de diff --git a/src/send_message.c b/src/send_message.c index 466ddad9a..393515410 100644 --- 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-2005 Hiroyuki Yamamoto + * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws 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 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H @@ -32,7 +32,9 @@ #include #include #include +#ifndef G_OS_WIN32 #include +#endif #include "send_message.h" #include "session.h" @@ -91,20 +93,23 @@ gint send_message(const gchar *file, PrefsAccount *ac_prefs, GSList *to_list) g_return_val_if_fail(ac_prefs != NULL, -1); g_return_val_if_fail(to_list != NULL, -1); - if ((fp = fopen(file, "rb")) == NULL) { + if ((fp = g_fopen(file, "rb")) == NULL) { FILE_OP_ERROR(file, "fopen"); return -1; } + inc_lock(); if (ac_prefs->use_mail_command && ac_prefs->mail_command && (*ac_prefs->mail_command)) { val = send_message_local(ac_prefs->mail_command, fp); fclose(fp); + inc_unlock(); return val; } else { val = send_message_smtp(ac_prefs, to_list, fp); fclose(fp); + inc_unlock(); return val; } } @@ -134,7 +139,12 @@ gint send_message_local(const gchar *command, FILE *fp) argv = strsplit_with_quote(command, " ", 0); if (g_spawn_async_with_pipes(NULL, argv, NULL, - G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, +#ifdef G_OS_WIN32 + 0, +#else + G_SPAWN_DO_NOT_REAP_CHILD, +#endif + NULL, NULL, &pid, &child_stdin, NULL, NULL, NULL) == FALSE) { g_snprintf(buf, sizeof(buf), @@ -163,9 +173,11 @@ gint send_message_local(const gchar *command, FILE *fp) fd_close(child_stdin); +#ifndef G_OS_WIN32 waitpid(pid, &status, 0); if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) err = TRUE; +#endif g_spawn_close_pid(pid); @@ -190,6 +202,10 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g gchar buf[BUFFSIZE]; gint ret = 0; gboolean was_inited = FALSE; + MsgInfo *tmp_msginfo = NULL; + MsgFlags flags = {0, 0}; + 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); @@ -197,13 +213,33 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g g_return_val_if_fail(to_list != NULL, -1); g_return_val_if_fail(fp != NULL, -1); + /* get the From address used, not necessarily the ac_prefs', + * because it's editable. */ + + fp_pos = ftell(fp); + tmp_msginfo = procheader_parse_stream(fp, flags, FALSE, FALSE); + fseek(fp, fp_pos, SEEK_SET); + + if (tmp_msginfo && tmp_msginfo->from) { + strncpy2(spec_from, tmp_msginfo->from, BUFFSIZE-1); + extract_address(spec_from); + } else { + strncpy2(spec_from, ac_prefs->address, BUFFSIZE-1); + } + if (tmp_msginfo) { + procmsg_msginfo_free(tmp_msginfo); + } + if (!ac_prefs->session) { /* we can't reuse a previously initialised session */ session = smtp_session_new(); smtp_session = SMTP_SESSION(session); - smtp_session->hostname = - ac_prefs->set_domain ? g_strdup(ac_prefs->domain) : NULL; + if (ac_prefs->set_domain && ac_prefs->domain && strlen(ac_prefs->domain)) { + smtp_session->hostname = g_strdup(ac_prefs->domain); + } else { + smtp_session->hostname = NULL; + } if (ac_prefs->use_smtp_auth) { smtp_session->forced_auth_type = ac_prefs->smtp_auth_type; @@ -220,8 +256,10 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g input_dialog_query_password (ac_prefs->smtp_server, smtp_session->user); - if (!smtp_session->pass) - smtp_session->pass = g_strdup(""); + if (!smtp_session->pass) { + session_destroy(session); + return -1; + } ac_prefs->tmp_smtp_pass = g_strdup(smtp_session->pass); } @@ -237,8 +275,10 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g input_dialog_query_password (ac_prefs->smtp_server, smtp_session->user); - if (!smtp_session->pass) - smtp_session->pass = g_strdup(""); + if (!smtp_session->pass) { + session_destroy(session); + return -1; + } ac_prefs->tmp_pass = g_strdup(smtp_session->pass); } @@ -255,6 +295,21 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g if (ac_prefs->ssl_smtp != SSL_NONE) session->nonblocking = ac_prefs->use_nonblocking_ssl; #else + if (ac_prefs->ssl_smtp != SSL_NONE) { + if (alertpanel_full(_("Insecure connection"), + _("This connection is configured to be secured " + "using SSL, but SSL is not available in this " + "build of Sylpheed-Claws. \n\n" + "Do you want to continue connecting to this " + "server? The communication would not be " + "secure."), + GTK_STOCK_CANCEL, _("Con_tinue connecting"), + NULL, FALSE, NULL, ALERT_WARNING, + G_ALERTDEFAULT) != G_ALERTALTERNATE) { + session_destroy(session); + return -1; + } + } port = ac_prefs->set_smtpport ? ac_prefs->smtpport : SMTP_PORT; #endif @@ -287,12 +342,12 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g (session, send_send_data_progressive, dialog); session_set_send_data_notify(session, send_send_data_finished, dialog); - ac_prefs->session = SMTP_SESSION(session); } else { /* everything is ready to start at MAIL FROM:, just * reinit useful variables. */ session = SESSION(ac_prefs->session); + ac_prefs->session = NULL; smtp_session = SMTP_SESSION(session); smtp_session->state = SMTP_HELO; dialog = (SendProgressDialog *)smtp_session->dialog; @@ -300,16 +355,19 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g } /* This has to be initialised for every mail sent */ - smtp_session->from = g_strdup(ac_prefs->address); + smtp_session->from = g_strdup(spec_from); smtp_session->to_list = to_list; smtp_session->cur_to = to_list; - smtp_session->send_data = get_outgoing_rfc2822_str(fp); - smtp_session->send_data_len = strlen(smtp_session->send_data); + smtp_session->send_data = (guchar *)get_outgoing_rfc2822_str(fp); + smtp_session->send_data_len = strlen((gchar *)smtp_session->send_data); + session_set_timeout(session, + prefs_common.io_timeout_secs * 1000); /* connect if necessary */ if (!was_inited && session_connect(session, ac_prefs->smtp_server, port) < 0) { session_destroy(session); send_progress_dialog_destroy(dialog); + ac_prefs->session = NULL; return -1; } @@ -328,6 +386,9 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g 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; } ret = -1; } else if (SMTP_SESSION(session)->state == SMTP_MAIL_SENT_OK) { @@ -360,7 +421,7 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g if (!keep_session || ret != 0) { if (session_is_connected(session)) smtp_quit(smtp_session); - while (session_is_connected(session)) + while (session_is_connected(session) && !dialog->cancelled) gtk_main_iteration(); session_destroy(session); ac_prefs->session = NULL; @@ -370,6 +431,9 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g g_free(smtp_session->send_data); g_free(smtp_session->error_msg); } + if (keep_session && ret == 0 && ac_prefs->session == NULL) + ac_prefs->session = SMTP_SESSION(session); + statusbar_pop_all(); statusbar_verbosity_set(FALSE); @@ -454,7 +518,7 @@ static gint send_send_data_progressive(Session *session, guint cur_len, cur_len, total_len); progress_dialog_set_label(dialog->dialog, buf); progress_dialog_set_fraction - (dialog->dialog, (gfloat)cur_len / (gfloat)total_len); + (dialog->dialog, (total_len == 0) ? 0 : (gfloat)cur_len / (gfloat)total_len); return 0; } @@ -469,10 +533,20 @@ static gint send_send_data_finished(Session *session, guint len, gpointer data) return 0; } +static void send_progress_dialog_size_allocate_cb(GtkWidget *widget, + GtkAllocation *allocation) +{ + g_return_if_fail(allocation != NULL); + + prefs_common.sendwin_width = allocation->width; + prefs_common.sendwin_height = allocation->height; +} + static SendProgressDialog *send_progress_dialog_create(void) { SendProgressDialog *dialog; ProgressDialog *progress; + static GdkGeometry geometry; dialog = g_new0(SendProgressDialog, 1); @@ -484,10 +558,22 @@ static SendProgressDialog *send_progress_dialog_create(void) g_signal_connect(G_OBJECT(progress->window), "delete_event", G_CALLBACK(gtk_true), NULL); gtk_window_set_modal(GTK_WINDOW(progress->window), TRUE); + g_signal_connect(G_OBJECT(progress->window), "size_allocate", + G_CALLBACK(send_progress_dialog_size_allocate_cb), NULL); manage_window_set_transient(GTK_WINDOW(progress->window)); progress_dialog_get_fraction(progress); + if (!geometry.min_height) { + geometry.min_width = 460; + geometry.min_height = 250; + } + + gtk_window_set_geometry_hints(GTK_WINDOW(progress->window), NULL, &geometry, + GDK_HINT_MIN_SIZE); + gtk_widget_set_size_request(progress->window, prefs_common.sendwin_width, + prefs_common.sendwin_height); + if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) { gtk_widget_show_now(progress->window); } @@ -564,7 +650,7 @@ static void send_put_error(Session *session) if (log_msg) log_warning("%s\n", log_msg); if (err_msg) { - alertpanel_error_log("%s", err_msg); + log_error("%s", err_msg); g_free(err_msg); } }