2004-11-17 [colin] 0.9.12cvs155

	* src/compose.c
	* src/toolbar.c
		Be verbose when sending fails
	* src/procmsg.c
		Fix procmsg_send_queue returning 0 when there's an error
		Don't send messages to be encrypted to nobody

diff --git a/ChangeLog.claws b/ChangeLog.claws
index f8508597f5a6bc8e004d71852a77423a3628ea38..294bc6c8b709b73d76594b3faee53c12bdbdd1bc 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2004-11-17 [colin]     0.9.12cvs155
+
+       * src/compose.c
+       * src/toolbar.c
+               Be verbose when sending fails
+       * src/procmsg.c
+               Fix procmsg_send_queue returning 0 when there's an error
+               Don't send messages to be encrypted to nobody 
+
+

 2004-11-17 [colin]     0.9.12cvs154
 
        * src/privacy.c
 2004-11-17 [colin]     0.9.12cvs154
 
        * src/privacy.c

diff --git a/PATCHSETS b/PATCHSETS
index 133daf0923666e615ed97540c05e5ecc6c902e49..fddfa81f675e1d14554cba446612702263286e75 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -137,3 +137,4 @@
 ( cvs diff -u -r 1.446 -r 1.447 ChangeLog; cvs diff -u -r 1.441 -r 1.442 ChangeLog.jp; cvs diff -u -r 1.51 -r 1.52 NEWS; cvs diff -u -r 1.454 -r 1.455 src/compose.c; cvs diff -u -r 1.20 -r 1.21 src/jpilot.c; cvs diff -u -r 1.92 -r 1.93 src/procmime.c; ) > 0.9.12cvs152.patchset
 ( cvs diff -u -r 1.33 -r 1.34 src/procmime.h; ) > 0.9.12cvs153.patchset
 ( cvs diff -u -r 1.11 -r 1.12 src/privacy.c; ) > 0.9.12cvs154.patchset
 ( cvs diff -u -r 1.446 -r 1.447 ChangeLog; cvs diff -u -r 1.441 -r 1.442 ChangeLog.jp; cvs diff -u -r 1.51 -r 1.52 NEWS; cvs diff -u -r 1.454 -r 1.455 src/compose.c; cvs diff -u -r 1.20 -r 1.21 src/jpilot.c; cvs diff -u -r 1.92 -r 1.93 src/procmime.c; ) > 0.9.12cvs152.patchset
 ( cvs diff -u -r 1.33 -r 1.34 src/procmime.h; ) > 0.9.12cvs153.patchset
 ( cvs diff -u -r 1.11 -r 1.12 src/privacy.c; ) > 0.9.12cvs154.patchset

+( cvs diff -u -r 1.455 -r 1.456 src/compose.c; cvs diff -u -r 1.173 -r 1.174 src/procmsg.c; cvs diff -u -r 1.55 -r 1.56 src/toolbar.c; ) > 0.9.12cvs155.patchset

diff --git a/configure.ac b/configure.ac
index 29a5fea1298918ac9dfa8ebc10d984fd9f63fd54..d9d3c1887b97e17c0ff81ec86593b10f0d267438 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=154
+EXTRA_VERSION=155

 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/compose.c b/src/compose.c
index 1cd6e60cc6e5ca453c44efb2aeb4f1c165b244cd..8e1a489bfb6165e34cfa3818bc40a4ec47e16beb 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3138,7 +3138,16 @@ gint compose_send(Compose *compose)
                folder_item_scan(folder);
                if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS)
                        gtk_widget_destroy(compose->window);
                folder_item_scan(folder);
                if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS)
                        gtk_widget_destroy(compose->window);

-       }
+       } else {
+               alertpanel_error(_("The message was queued but could not be "
+                                  "sent.\nUse \"Send queued messages\" from "
+                                  "the main window to retry."));
+               if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
+                       compose_allow_user_actions (compose, TRUE);
+                       compose->sending = FALSE;               
+               }
+               return -1;
+       }

 
        return 0;
 
 
        return 0;
 


@@ -3652,7 +3661,9 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
                        gchar *encdata;
 
                        encdata = privacy_get_encrypt_data(compose->privacy_system, compose->to_list);
                        gchar *encdata;
 
                        encdata = privacy_get_encrypt_data(compose->privacy_system, compose->to_list);

-                       fprintf(fp, "X-Sylpheed-Encrypt-Data:%s\n", encdata);
+                       if (encdata != NULL)
+                               fprintf(fp, "X-Sylpheed-Encrypt-Data:%s\n", 
+                                       encdata);

                        g_free(encdata);
                }
        }
                        g_free(encdata);
                }
        }

diff --git a/src/procmsg.c b/src/procmsg.c
index 8b00c36257813e2be8b47e6e43cdefe244c696e9..f5c0e4f67bbe34e6020bf34fc8df069fa1212fda 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -639,7 +639,7 @@ void procmsg_empty_all_trash(void)
  */
 gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs)
 {
  */
 gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs)
 {

-       gint ret = 1, count = 0;
+       gint sent = 0, err = 0;

        GSList *list, *elem;
 
        if (!queue)
        GSList *list, *elem;
 
        if (!queue)


@@ -660,7 +660,7 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs)
                                if (procmsg_send_message_queue(file) < 0) {
                                        g_warning("Sending queued message %d failed.\n", 
                                                  msginfo->msgnum);
                                if (procmsg_send_message_queue(file) < 0) {
                                        g_warning("Sending queued message %d failed.\n", 
                                                  msginfo->msgnum);

-                                       ret = -1;
+                                       err++;

                                } else {
                                        /* CLAWS: 
                                         * We save in procmsg_send_message_queue because
                                } else {
                                        /* CLAWS: 
                                         * We save in procmsg_send_message_queue because


@@ -672,7 +672,7 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs)
                                                        (queue->folder->outbox,
                                                         file, TRUE);
                                         */
                                                        (queue->folder->outbox,
                                                         file, TRUE);
                                         */

-                                       count++; 
+                                       sent++; 

                                        folder_item_remove_msg(queue, msginfo->msgnum);
                                }
                                g_free(file);
                                        folder_item_remove_msg(queue, msginfo->msgnum);
                                }
                                g_free(file);


@@ -684,7 +684,7 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs)
                procmsg_msginfo_free(msginfo);
        }
 
                procmsg_msginfo_free(msginfo);
        }
 

-       return ret * count;
+       return (err != 0 ? -err : sent);

 }
 
 gint procmsg_remove_special_headers(const gchar *in, const gchar *out)
 }
 
 gint procmsg_remove_special_headers(const gchar *in, const gchar *out)

diff --git a/src/toolbar.c b/src/toolbar.c
index 0365e05339cfd5b4ec434cc6351ff31f6f081266..576d636fc368c659aea391f31190bcd2588f2cbf 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1872,7 +1872,10 @@ void send_queue_cb(gpointer data, guint action, GtkWidget *widget)
                Folder *folder = list->data;
 
                if (folder->queue) {
                Folder *folder = list->data;
 
                if (folder->queue) {

-                       procmsg_send_queue(folder->queue, prefs_common.savemsg);
+                       if (procmsg_send_queue(folder->queue, 
+                                              prefs_common.savemsg) < 0)
+                               alertpanel_error(_("Some errors occurred while "
+                                                  "sending queued messages."));

                        folder_item_scan(folder->queue);
                }
        }
                        folder_item_scan(folder->queue);
                }
        }