2007-01-10 [colin] 2.7.0cvs5

	* src/mainwindow.c
		Fix bug 1095, 'Crash while changing folder
		columns during incorporation'

diff --git a/ChangeLog b/ChangeLog
index 94c7d936aa5da3deaf08ac28d6264bdc20d26ff7..df61ecc7ec3de600ae881f2be3c2c28f4d6faf81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-10 [colin]     2.7.0cvs5
+
+       * src/mainwindow.c
+               Fix bug 1095, 'Crash while changing folder 
+               columns during incorporation'
+

 2007-01-09 [colin]     2.7.0cvs4
 
        * src/gtk/pluginwindow.c
 2007-01-09 [colin]     2.7.0cvs4
 
        * src/gtk/pluginwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index 71f88232dc636d558f33d06e588fe23a958427d9..81290f4d9389504663ca745e75e82aebabbe9bbc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2231,3 +2231,4 @@
 ( cvs diff -u -r 1.28.2.9 -r 1.28.2.10 po/nl.po;  ) > 2.7.0cvs2.patchset
 ( cvs diff -u -r 1.2.2.29 -r 1.2.2.30 src/gtk/filesel.c;  ) > 2.7.0cvs3.patchset
 ( cvs diff -u -r 1.5.2.40 -r 1.5.2.41 src/gtk/pluginwindow.c;  ) > 2.7.0cvs4.patchset
 ( cvs diff -u -r 1.28.2.9 -r 1.28.2.10 po/nl.po;  ) > 2.7.0cvs2.patchset
 ( cvs diff -u -r 1.2.2.29 -r 1.2.2.30 src/gtk/filesel.c;  ) > 2.7.0cvs3.patchset
 ( cvs diff -u -r 1.5.2.40 -r 1.5.2.41 src/gtk/pluginwindow.c;  ) > 2.7.0cvs4.patchset

+( cvs diff -u -r 1.274.2.161 -r 1.274.2.162 src/mainwindow.c;  ) > 2.7.0cvs5.patchset

diff --git a/configure.ac b/configure.ac
index 81e7151eaa926d2f4d94b8f466acec7582502c80..b1c420d6e07cf3c8f13f8e634ce79fc0c0333c68 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=4
+EXTRA_VERSION=5

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 5dfe566cc2a1ed04c9afa4d83091d1db9b644848..8614aee0b209270850f725f7b31100c9a99fe561 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2232,6 +2232,8 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Edit/Select thread"             , M_SINGLE_TARGET_EXIST},
                {"/Edit/Find in current message...", M_SINGLE_TARGET_EXIST},
 
                {"/Edit/Select thread"             , M_SINGLE_TARGET_EXIST},
                {"/Edit/Find in current message...", M_SINGLE_TARGET_EXIST},
 

+               {"/View/Set displayed columns/in Folder list..."
+                                                  , M_UNLOCKED}, 

                {"/View/Sort"                      , M_EXEC},
                {"/View/Thread view"               , M_EXEC},
                {"/View/Expand all threads"        , M_MSG_EXIST},
                {"/View/Sort"                      , M_EXEC},
                {"/View/Thread view"               , M_EXEC},
                {"/View/Expand all threads"        , M_MSG_EXIST},