From: Colin Leroy Date: Mon, 7 Nov 2005 16:52:29 +0000 (+0000) Subject: 2005-11-07 [cleroy] 1.9.99cvs16 X-Git-Tag: rel_1_9_100~2 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=c9e3f93662a96c781da36470cb7076def884746c 2005-11-07 [cleroy] 1.9.99cvs16 * src/send_message.c Fix bug #314 (Queue does not empty under certain circumstances) --- diff --git a/ChangeLog b/ChangeLog index 9777d0712..ae62b69d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-11-07 [cleroy] 1.9.99cvs16 + + * src/send_message.c + Fix bug #314 (Queue does not empty under certain + circumstances) + 2005-11-07 [paul] 1.9.99cvs15 * src/mutt.c diff --git a/PATCHSETS b/PATCHSETS index 66ff09d0d..9384c7fff 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -982,3 +982,4 @@ ( cvs diff -u -r 1.12.2.4 -r 1.12.2.5 src/ldif.c; ) > 1.9.99cvs13.patchset ( cvs diff -u -r 1.2 -r 1.3 doc/man/Makefile.am; diff -u /dev/null doc/man/sylpheed-claws.1; cvs diff -u -r -1.5.2.2 -r -1.5.2.3 doc/man/sylpheed.1; ) > 1.9.99cvs14.patchset ( cvs diff -u -r 1.6.10.5 -r 1.6.10.6 src/mutt.c; cvs diff -u -r 1.6.2.4 -r 1.6.2.5 src/pine.c; ) > 1.9.99cvs15.patchset +( cvs diff -u -r 1.17.2.21 -r 1.17.2.22 src/send_message.c; ) > 1.9.99cvs16.patchset diff --git a/configure.ac b/configure.ac index 3e1e9ecc1..ab5ad092a 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=99 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=15 +EXTRA_VERSION=16 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/send_message.c b/src/send_message.c index 3402edbdd..34aa6b991 100644 --- a/src/send_message.c +++ b/src/send_message.c @@ -96,15 +96,18 @@ gint send_message(const gchar *file, PrefsAccount *ac_prefs, GSList *to_list) return -1; } + inc_lock(); if (ac_prefs->use_mail_command && ac_prefs->mail_command && (*ac_prefs->mail_command)) { val = send_message_local(ac_prefs->mail_command, fp); fclose(fp); + inc_unlock(); return val; } else { val = send_message_smtp(ac_prefs, to_list, fp); fclose(fp); + inc_unlock(); return val; } }