2005-11-07 [cleroy] 1.9.99cvs16

[claws.git] / src / send_message.c

diff --git a/src/send_message.c b/src/send_message.c
index fa9bd5b651b2c620b8ec0b1d1ef2eb4949d95b1f..34aa6b991a711ff6521487e1959726dfd3cd0c04 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-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
  *
  * 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
@@ -28,10 +28,11 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkwindow.h>
-#include <gtk/gtkclist.h>
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #include "send_message.h"
 #include "session.h"
@@ -90,20 +91,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;
        }
 }
@@ -123,6 +127,7 @@ gint send_message_local(const gchar *command, FILE *fp)
        gint child_stdin;
        gchar buf[BUFFSIZE];
        gboolean err = FALSE;
+       gint status;
 
        g_return_val_if_fail(command != NULL, -1);
        g_return_val_if_fail(fp != NULL, -1);
@@ -131,8 +136,10 @@ gint send_message_local(const gchar *command, FILE *fp)
 
        argv = strsplit_with_quote(command, " ", 0);
 
-       if (g_spawn_async_with_pipes(NULL, argv, NULL, 0, NULL, NULL, &pid,
-                                    &child_stdin, NULL, NULL, NULL) == FALSE) {
+       if (g_spawn_async_with_pipes(NULL, argv, NULL,
+                                    G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL,
+                                    &pid, &child_stdin, NULL, NULL,
+                                    NULL) == FALSE) {
                g_snprintf(buf, sizeof(buf),
                           _("Can't execute command: %s"), command);
                log_warning("%s\n", buf);
@@ -158,6 +165,11 @@ gint send_message_local(const gchar *command, FILE *fp)
        }
 
        fd_close(child_stdin);
+
+       waitpid(pid, &status, 0);
+       if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+               err = TRUE;
+
        g_spawn_close_pid(pid);
 
        if (err) {
@@ -246,6 +258,20 @@ 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."),
+                                 _("Con_tinue connecting"), 
+                                 GTK_STOCK_CANCEL, NULL,
+                                 FALSE, NULL, ALERT_WARNING,
+                                 G_ALERTALTERNATE) != G_ALERTDEFAULT)
+                               return -1;
+               }
                port = ac_prefs->set_smtpport ? ac_prefs->smtpport : SMTP_PORT;
        #endif
 
@@ -351,7 +377,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;