aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/compose.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 83dc70bc..517479df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-05-30
+ * src/compose.c: compose_send(): fixed a bug that messages could not
+ be sent with POP before SMTP enabled ([sylpheed-jp:11173]).
+
+2012-05-30
+
* manual/ja/*.html
manual/ja/Makefile.am: convert the encoding of HTML files to UTF-8
(prevents garbled character with IE).
diff --git a/src/compose.c b/src/compose.c
index e81e7ccf..3048e16b 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -3566,7 +3566,13 @@ static gint compose_send(Compose *compose)
return -1;
}
}
+
+ /* POP before SMTP requires inc to be unlocked.
+ send_message() also locks inc internally. */
+ inc_unlock();
ok = send_message(tmp, ac, compose->to_list);
+ inc_lock();
+
statusbar_pop_all();
}