2007-08-28 [colin] 2.10.0cvs182

	* src/mainwindow.c
		Don't use current folder settings when
		composing from the compose button's
		account selector

diff --git a/ChangeLog b/ChangeLog
index 094fa25970f5a2c57605782222aa1bfb5d1c171b..4a9082061deabc480d3311076e1d86e53cb05061 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-28 [colin]     2.10.0cvs182
+
+       * src/mainwindow.c
+               Don't use current folder settings when
+               composing from the compose button's
+               account selector
+
 2007-08-28 [colin]     2.10.0cvs181
 
        * src/quote_fmt_parse.y

diff --git a/PATCHSETS b/PATCHSETS
index 7ffb27326c741fcf7da20ed731f2fc8bf563a5ed..77508ea21ab182f0a8792251a39ea74ca74ea180 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2836,3 +2836,4 @@
 ( cvs diff -u -r 1.395.2.322 -r 1.395.2.323 src/summaryview.c;  ) > 2.10.0cvs179.patchset
 ( cvs diff -u -r 1.382.2.403 -r 1.382.2.404 src/compose.c;  cvs diff -u -r 1.50.2.41 -r 1.50.2.42 src/compose.h;  ) > 2.10.0cvs180.patchset
 ( cvs diff -u -r 1.22.2.35 -r 1.22.2.36 src/quote_fmt_parse.y;  ) > 2.10.0cvs181.patchset
+( cvs diff -u -r 1.274.2.207 -r 1.274.2.208 src/mainwindow.c;  ) > 2.10.0cvs182.patchset

diff --git a/configure.ac b/configure.ac
index a3ef0a0ba1c18c370ea87367a059b134f682851c..16e3631bd893dd53f98da60f7db0c1cb3756ec62 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=181
+EXTRA_VERSION=182
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index b986c2f88b51311dfe3dfa94eb4543ea23d6c654..d5de5914b54eb667f9e7b45a8492b7b56a67e1ac 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -4209,7 +4209,7 @@ static void account_compose_menu_cb(GtkMenuItem *menuitem, gpointer data)
        PrefsAccount *account = (PrefsAccount *)data;
        FolderItem *item = mainwin->summaryview->folder_item;   
 
-       compose_new_with_folderitem(account, item, NULL);
+       compose_new_with_folderitem(account, NULL, NULL);
 }
 
 static void prefs_open_cb(GtkMenuItem *menuitem, gpointer data)