From: Paul Mangan <paul@claws-mail.org>
Date: Wed, 26 Sep 2001 10:34:08 +0000 (+0000)
Subject: make 'Follow-up and reply to' sensitive
X-Git-Tag: Release_0_6_4claws12~104
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=c91e151bed31f7e60a924eb746a87994f441f973;ds=sidebyside

make 'Follow-up and reply to' sensitive
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index fc392ad0a..04161f555 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2001-09-26 [paul]	0.6.2claws6
+
+	* src/mainwindow.c
+		make 'Follow-up and reply to' sensitive
+
+	* more sync with sylpheed 0.6.2cvs5
+
 2001-09-25 [melvin]
 
 	* 0.6.2claws5
diff --git a/configure.in b/configure.in
index 4711411b2..b1d5db62f 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws5
+EXTRA_VERSION=claws6
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
diff --git a/src/mainwindow.c b/src/mainwindow.c
index c4c4e5cad..63fdb96ec 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1223,7 +1223,8 @@ typedef enum
 	M_ALLOW_REEDIT        = 1 << 5,
 	M_HAVE_ACCOUNT        = 1 << 6,
 	M_THREADED	      = 1 << 7,
-	M_UNTHREADED	      = 1 << 8
+	M_UNTHREADED	      = 1 << 8,
+	M_NEWS                = 1 << 9
 } SensitiveCond;
 
 static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
@@ -1251,6 +1252,9 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
 	if (mainwin->summaryview->folder_item &&
 	    mainwin->summaryview->folder_item->folder->type != F_NEWS)
 		state |= M_EXEC;
+	if (mainwin->summaryview->folder_item &&
+	    mainwin->summaryview->folder_item->folder->type == F_NEWS)
+		state |= M_NEWS;
 	if (selection == SUMMARY_SELECTED_SINGLE &&
 	    (mainwin->summaryview->folder_item &&
 	     (mainwin->summaryview->folder_item->stype == F_DRAFT ||
@@ -1322,15 +1326,16 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
 		{"/View/Show all header"      , M_SINGLE_TARGET_EXIST},
 		{"/View/View source"          , M_SINGLE_TARGET_EXIST},
 
-		{"/Message/Get new mail"         , M_HAVE_ACCOUNT|M_UNLOCKED},
-		{"/Message/Get from all accounts", M_HAVE_ACCOUNT|M_UNLOCKED},
-/*		{"/Message/Compose new message"  , M_HAVE_ACCOUNT}, */
-		{"/Message/Reply"                , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-		{"/Message/Reply to sender"      , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-		{"/Message/Reply to all"         , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-		{"/Message/Forward"              , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-		{"/Message/Forward as attachment", M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-		{"/Message/Open in new window"   , M_SINGLE_TARGET_EXIST},
+		{"/Message/Get new mail"          , M_HAVE_ACCOUNT|M_UNLOCKED},
+		{"/Message/Get from all accounts" , M_HAVE_ACCOUNT|M_UNLOCKED},
+/*		{"/Message/Compose new message"   , M_HAVE_ACCOUNT}, */
+		{"/Message/Reply"                 , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+		{"/Message/Reply to sender"       , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+		{"/Message/Reply to all"          , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+		{"/Message/Follow-up and reply to", M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
+		{"/Message/Forward"               , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+		{"/Message/Forward as attachment" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+		{"/Message/Open in new window"    , M_SINGLE_TARGET_EXIST},
 		{"/Message/Re-edit", M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
 		{"/Message/Move...", M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
 		{"/Message/Copy...", M_TARGET_EXIST|M_EXEC|M_UNLOCKED},