2007-08-18 [colin] 2.10.0cvs130

[claws.git] / src / send_message.c

diff --git a/src/send_message.c b/src/send_message.c
index 6db9a1d96718b20894f45c3f4fa65387cbd282c0..e32f0f866096ba32ccc02553d71f771a14908c5f 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -134,7 +134,7 @@ gint send_message_local(const gchar *command, FILE *fp)
        g_return_val_if_fail(command != NULL, -1);
        g_return_val_if_fail(fp != NULL, -1);
 
-       log_message(_("Sending message using command: %s\n"), command);
+       log_message(LOG_PROTOCOL, _("Sending message using command: %s\n"), command);
 
        argv = strsplit_with_quote(command, " ", 0);
 
@@ -149,7 +149,7 @@ gint send_message_local(const gchar *command, FILE *fp)
                                     NULL) == FALSE) {
                g_snprintf(buf, sizeof(buf),
                           _("Couldn't execute command: %s"), command);
-               log_warning("%s\n", buf);
+               log_warning(LOG_PROTOCOL, "%s\n", buf);
                alertpanel_error("%s", buf);
                g_strfreev(argv);
                return -1;
@@ -185,7 +185,7 @@ gint send_message_local(const gchar *command, FILE *fp)
                g_snprintf(buf, sizeof(buf),
                           _("Error occurred while executing command: %s"),
                           command);
-               log_warning("%s\n", buf);
+               log_warning(LOG_PROTOCOL, "%s\n", buf);
                alertpanel_error("%s", buf);
                return -1;
        }
@@ -299,7 +299,7 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
                        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"
+                                 "build of Claws Mail. \n\n"
                                  "Do you want to continue connecting to this "
                                  "server? The communication would not be "
                                  "secure."),
@@ -325,7 +325,7 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
                    && (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(buf);
+                       log_message(LOG_PROTOCOL, buf);
                        progress_dialog_set_label(dialog->dialog, buf);
                        progress_dialog_list_set_status(dialog->dialog, 0, _("POP before SMTP"));
                        GTK_EVENTS_FLUSH();
@@ -335,7 +335,7 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
                g_snprintf(buf, sizeof(buf), _("Connecting to SMTP server: %s ..."),
                           ac_prefs->smtp_server);
                progress_dialog_set_label(dialog->dialog, buf);
-               log_message("%s\n", buf);
+               log_message(LOG_PROTOCOL, "%s\n", buf);
 
                session_set_recv_message_notify(session, send_recv_message, dialog);
                session_set_send_data_progressive_notify
@@ -392,12 +392,12 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
                }
                ret = -1;
        } else if (SMTP_SESSION(session)->state == SMTP_MAIL_SENT_OK) {
-               log_message("%s\n", _("Mail sent successfully."));
+               log_message(LOG_PROTOCOL, "%s\n", _("Mail sent successfully."));
                ret = 0;
        } else if (session->state == SESSION_EOF &&
                   SMTP_SESSION(session)->state == SMTP_QUIT) {
                /* consider EOF right after QUIT successful */
-               log_warning("%s\n", _("Connection closed by the remote host."));
+               log_warning(LOG_PROTOCOL, "%s\n", _("Connection closed by the remote host."));
                ret = 0;
        } else if (session->state == SESSION_ERROR ||
                   session->state == SESSION_EOF ||
@@ -574,7 +574,7 @@ static SendProgressDialog *send_progress_dialog_create(void)
        gtk_widget_set_size_request(progress->window, prefs_common.sendwin_width,
                                    prefs_common.sendwin_height);
 
-       if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
+       if (!prefs_common.send_dialog_invisible) {
                gtk_widget_show_now(progress->window);
        }
        
@@ -586,7 +586,7 @@ static SendProgressDialog *send_progress_dialog_create(void)
 static void send_progress_dialog_destroy(SendProgressDialog *dialog)
 {
        g_return_if_fail(dialog != NULL);
-       if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
+       if (!prefs_common.send_dialog_invisible) {
                progress_dialog_destroy(dialog->dialog);
        }
        g_free(dialog);
@@ -648,11 +648,11 @@ static void send_put_error(Session *session)
        }
 
        if (err_msg) {
-               log_error("%s\n", err_msg);
+               log_error(LOG_PROTOCOL, "%s\n", err_msg);
                g_free(err_msg);
        } else {
                if (log_msg)
-                       log_warning("%s\n", log_msg);
+                       log_warning(LOG_PROTOCOL, "%s\n", log_msg);
        }
 }