replace deprecated gtk_progress*

[claws.git] / src / send_message.c

diff --git a/src/send_message.c b/src/send_message.c
index 0327d3716eef271d1c3476077adc345c86d4d8a6..54e844cfa557306d16aad3ca9edfc47f641d83d1 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -307,8 +307,7 @@ gint send_message_smtp(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp)
 
        if (ac_prefs->use_smtp_auth) {
                smtp_session->forced_auth_type = ac_prefs->smtp_auth_type;
-
-               if (ac_prefs->smtp_userid) {
+               if (ac_prefs->smtp_userid && strlen(ac_prefs->smtp_userid)) {
                        smtp_session->user = g_strdup(ac_prefs->smtp_userid);
                        if (ac_prefs->smtp_passwd)
                                smtp_session->pass =
@@ -414,6 +413,7 @@ gint send_message_smtp(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp)
                ret = -1;
        } else if (session->state == SESSION_ERROR ||
                   session->state == SESSION_EOF ||
+                  session->state == SESSION_TIMEOUT ||
                   SMTP_SESSION(session)->state == SMTP_ERROR ||
                   SMTP_SESSION(session)->error_val != SM_OK)
                ret = -1;
@@ -506,7 +506,7 @@ static gint send_send_data_progressive(Session *session, guint cur_len,
        g_snprintf(buf, sizeof(buf), _("Sending message (%d / %d bytes)"),
                   cur_len, total_len);
        progress_dialog_set_label(dialog->dialog, buf);
-       progress_dialog_set_percentage
+       progress_dialog_set_fraction
                (dialog->dialog, (gfloat)cur_len / (gfloat)total_len);
 
        return 0;
@@ -532,14 +532,14 @@ static SendProgressDialog *send_progress_dialog_create(void)
        progress = progress_dialog_create();
        gtk_window_set_title(GTK_WINDOW(progress->window),
                             _("Sending message"));
-       gtk_signal_connect(GTK_OBJECT(progress->cancel_btn), "clicked",
-                          GTK_SIGNAL_FUNC(send_cancel_button_cb), dialog);
-       gtk_signal_connect(GTK_OBJECT(progress->window), "delete_event",
-                          GTK_SIGNAL_FUNC(gtk_true), NULL);
+       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",
+                        G_CALLBACK(gtk_true), NULL);
        gtk_window_set_modal(GTK_WINDOW(progress->window), TRUE);
        manage_window_set_transient(GTK_WINDOW(progress->window));
 
-       progress_dialog_set_value(progress, 0.0);
+       progress_dialog_get_fraction(progress);
 
        if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
                gtk_widget_show_now(progress->window);
@@ -594,13 +594,22 @@ static void send_put_error(Session *session)
                        err_msg = g_strdup(log_msg);
                break;
        default:
-               if (session->state == SESSION_ERROR) {
+               switch (session->state) {
+               case SESSION_ERROR:
                        log_msg =
                                _("Error occurred while sending the message.");
                        err_msg = g_strdup(log_msg);
-               } else if (session->state == SESSION_EOF) {
+                       break;
+               case SESSION_EOF:
                        log_msg = _("Connection closed by the remote host.");
                        err_msg = g_strdup(log_msg);
+                       break;
+               case SESSION_TIMEOUT:
+                       log_msg = _("Session timed out.");
+                       err_msg = g_strdup(log_msg);
+                       break;
+               default:
+                       break;
                }
                break;
        }