From cbf3d26c9a5fa2ea10441938d1d3c12346b2c7ab Mon Sep 17 00:00:00 2001
From: Christoph Hohmann <reboot@gmx.ch>
Date: Tue, 15 Jan 2002 20:38:39 +0000
Subject: [PATCH] * src/procmsg.c         added alertpanel if mail sending
 failed

---
 ChangeLog.claws |  7 ++++++-
 configure.in    |  2 +-
 src/procmsg.c   | 19 ++++++++++---------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index fa38ef6c2..a909db12e 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,4 +1,9 @@
-2002-04-15 [alfons]	0.7.0claws2
+2002-01-15 [christoph]	0.7.0claws3
+
+	* src/procmsg.c
+		added alertpanel if mail sending failed
+
+2002-01-15 [alfons]	0.7.0claws2
 	
 	* src/prefs_filtering.c
 		don't stop timer when prefs filtering dialog is opened
diff --git a/configure.in b/configure.in
index 050479203..2ec0efba8 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws2
+EXTRA_VERSION=claws3
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
diff --git a/src/procmsg.c b/src/procmsg.c
index 746349234..2d5cde25f 100644
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -1072,23 +1072,24 @@ gint procmsg_send_message_queue(const gchar *file)
 				mailval = send_message_smtp(&tmp_ac, to_list, fp);
 			}
 		}
+		if (mailval < 0) {
+            		alertpanel_error(_("Error occurred while sending the message to %s ."),
+                                 mailac ? mailac->smtp_server : smtpserver);
+		}
 	}
 
-	if(newsgroup_list) {
+	if(newsgroup_list && (newsval == 0)) {
 		Folder *folder;
 
 		debug_print(_("Sending message by news\n"));
 
 		folder = FOLDER(newsac->folder);
 
-		if(newsval == 0) {
-            		newsval = news_post(folder, tmp);
-            		if (newsval < 0) {
-                    		alertpanel_error(_("Error occurred while posting the message to %s ."),
-                                         newsac->nntp_server);
-            		}
-		}
-
+    		newsval = news_post(folder, tmp);
+    		if (newsval < 0) {
+            		alertpanel_error(_("Error occurred while posting the message to %s ."),
+                                 newsac->nntp_server);
+    		}
 	}
 
 	/* save message to outbox */
-- 
2.25.1