2006-06-30 [colin] 2.3.1cvs47
authorColin Leroy <colin@colino.net>
Fri, 30 Jun 2006 20:37:04 +0000 (20:37 +0000)
committerColin Leroy <colin@colino.net>
Fri, 30 Jun 2006 20:37:04 +0000 (20:37 +0000)
* src/compose.c
Block undo when changing signature (by changing
account)

ChangeLog
PATCHSETS
configure.ac
src/compose.c

index ba42019199082ac10863d9514b735e27d4c7d56e..af2cf5a9149a5320f982124f2565f79a48bae4f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-30 [colin]     2.3.1cvs47
+
+       * src/compose.c
+               Block undo when changing signature (by changing
+               account)
+
 2006-06-30 [paul]      2.3.1cvs46
 
        * src/send_message.c
index 194bd60563b4c494b19df7821ab96fcdb334e70c..ecbc875aac731808272ce223a74aa5b8634b09f5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.207.2.104 -r 1.207.2.105 src/folderview.c;  cvs diff -u -r 1.20.2.11 -r 1.20.2.12 src/folderview.h;  cvs diff -u -r 1.274.2.121 -r 1.274.2.122 src/mainwindow.c;  cvs diff -u -r 1.395.2.221 -r 1.395.2.222 src/summaryview.c;  cvs diff -u -r 1.36.2.69 -r 1.36.2.70 src/common/utils.c;  ) > 2.3.1cvs44.patchset
 ( cvs diff -u -r 1.382.2.289 -r 1.382.2.290 src/compose.c;  ) > 2.3.1cvs45.patchset
 ( cvs diff -u -r 1.17.2.31 -r 1.17.2.32 src/send_message.c;  ) > 2.3.1cvs46.patchset
+( cvs diff -u -r 1.382.2.290 -r 1.382.2.291 src/compose.c;  ) > 2.3.1cvs47.patchset
index 848f3bb8cd9a1549ec446d24fa6bf74197257e72..3a903c401959255f58a3f89f8fcd5706f2412a5d 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=46
+EXTRA_VERSION=47
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 59270a8e7e2e2670987de54ccce925cdfafa37cf..c3710ec1036b9fa78b87ada4cb7b3f6f6abd63d8 100644 (file)
@@ -3896,8 +3896,11 @@ static void compose_select_account(Compose *compose, PrefsAccount *account,
                                       
        activate_privacy_system(compose, account, FALSE);
 
-       if (!init && compose->mode != COMPOSE_REDIRECT)
+       if (!init && compose->mode != COMPOSE_REDIRECT) {
+               undo_block(compose->undostruct);
                compose_insert_sig(compose, TRUE);
+               undo_unblock(compose->undostruct);
+       }
 }
 
 gboolean compose_check_for_valid_recipient(Compose *compose) {