2012-01-31 [wwp] 3.8.0cvs18

[claws.git] / src / send_message.c

diff --git a/src/send_message.c b/src/send_message.c
index 104da08ebcc3179b8d1bd7a30ff2a9c95efba8d9..4b309df0591623c2c689fb7f3996ebfa48f5c993 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-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2011 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
@@ -47,6 +47,7 @@
 #include "inputdialog.h"
 #include "alertpanel.h"
 #include "manage_window.h"
+#include "logwindow.h"
 #include "socket.h"
 #include "utils.h"
 #include "gtkutils.h"
@@ -76,6 +77,8 @@ static gint send_send_data_finished   (Session                *session,
 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);
 
@@ -87,9 +90,9 @@ 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");
@@ -129,8 +132,8 @@ gint send_message_local(const gchar *command, FILE *fp)
        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);
 
@@ -205,11 +208,11 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
        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. */
@@ -322,8 +325,8 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
                        inc_pop_before_smtp(ac_prefs);
                }
 
-               g_snprintf(buf, sizeof(buf), _("Connecting to SMTP server: %s ..."),
-                          ac_prefs->smtp_server);
+               g_snprintf(buf, sizeof(buf), _("Account '%s': Connecting to SMTP server: %s ..."),
+                               ac_prefs->account_name, ac_prefs->smtp_server);
                progress_dialog_set_label(dialog->dialog, buf);
                log_message(LOG_PROTOCOL, "%s\n", buf);
 
@@ -368,7 +371,7 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
                smtp_from(smtp_session);
        }
 
-       while (session_is_connected(session) && dialog->cancelled == FALSE
+       while (session_is_running(session) && dialog->cancelled == FALSE
                && SMTP_SESSION(session)->state != SMTP_MAIL_SENT_OK)
                gtk_main_iteration();
 
@@ -439,7 +442,7 @@ static gint send_recv_message(Session *session, const gchar *msg, gpointer 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:
@@ -496,7 +499,7 @@ static gint send_send_data_progressive(Session *session, guint cur_len,
        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)
@@ -508,10 +511,13 @@ static gint send_send_data_progressive(Session *session, guint cur_len,
        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;
 }
@@ -521,12 +527,14 @@ static gint send_send_data_finished(Session *session, guint len, gpointer data)
        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;
 }
@@ -534,7 +542,7 @@ static gint send_send_data_finished(Session *session, guint len, gpointer data)
 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;
@@ -551,6 +559,8 @@ static SendProgressDialog *send_progress_dialog_create(void)
        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",
@@ -583,16 +593,24 @@ static SendProgressDialog *send_progress_dialog_create(void)
 
 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);
 }
 
+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;
 }
@@ -638,7 +656,7 @@ static void send_put_error(Session *session)
                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: