* src/compose.c

        always delete message from queue after sending/send error
        (closes bug #509601 "puting message on queue when send fails")

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 720e07ec2b9016278872464fb6a6c3c53b8515af..2224b79a09a73a1f9163599d136e2ff1f1cdbdee 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-02-12 [christoph] 0.7.0claws63
+
+       * src/compose.c
+               always delete message from queue after sending/send error
+               (closes bug #509601)
+
 2002-02-12 [melvin]    0.7.0claws62
 
        * src/prefs_actions.c

diff --git a/configure.in b/configure.in
index 7fe39b1df3e09bede53638454feabeadcc8190ee..36ddc4181fe600d5e3b3326732b1265fa9ec7b48 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws62
+EXTRA_VERSION=claws63
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index 96293c1944a2a7163d3b7cdc87b4cf92077eb9ba..5e700bdc22cf977969a7c39bb3b8f946518b578e 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2742,10 +2742,9 @@ gint compose_send(Compose *compose)
        }
        
        val = procmsg_send_message_queue(folder_item_fetch_msg(folder, msgnum));
-       if(!val) {
-               folder_item_remove_msg(folder, msgnum);
-               folderview_update_item(folder, TRUE);
-       }
+
+       folder_item_remove_msg(folder, msgnum);
+       folderview_update_item(folder, TRUE);
 
        return val;
 }