talons

commit 5f42c086df2879210c17c53979c3cecf5944a7e1
parent 5991df49cc9f2cfcf3aed5a92aa02d7fa85a54b6
Author: Paweł Pękala <c0rn@gazeta.pl>
Date:   Mon, 20 Sep 2010 14:05:46 +0000

2010-09-20 [pawel]	3.7.6cvs41

	* src/compose.c
	* src/mainwindow.c
	* src/summaryview.c
		revert last patch

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/compose.c
 | 
4
+---
M
src/mainwindow.c
 | 
7
++-----
M
src/summaryview.c
 | 
10
----------

6 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-20 [pawel]	3.7.6cvs41
+
+	* src/compose.c
+	* src/mainwindow.c
+	* src/summaryview.c
+		revert last patch
+
 2010-09-19 [pawel]	3.7.6cvs40
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4036,3 +4036,4 @@
 ( cvs diff -u -r 1.382.2.556 -r 1.382.2.557 src/compose.c;  ) > 3.7.6cvs38.patchset
 ( cvs diff -u -r 1.382.2.557 -r 1.382.2.558 src/compose.c;  ) > 3.7.6cvs39.patchset
 ( cvs diff -u -r 1.382.2.558 -r 1.382.2.559 src/compose.c;  cvs diff -u -r 1.274.2.315 -r 1.274.2.316 src/mainwindow.c;  cvs diff -u -r 1.395.2.422 -r 1.395.2.423 src/summaryview.c;  ) > 3.7.6cvs40.patchset
+( cvs diff -u -r 1.382.2.559 -r 1.382.2.560 src/compose.c;  cvs diff -u -r 1.274.2.316 -r 1.274.2.317 src/mainwindow.c;  cvs diff -u -r 1.395.2.423 -r 1.395.2.424 src/summaryview.c;  ) > 3.7.6cvs41.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=40
+EXTRA_VERSION=41
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
@@ -1535,9 +1535,7 @@ static Compose *compose_generic_reply(MsgInfo *msginfo,
 		compose_destroy(compose);
 		return NULL;
 	}
-	if (!compose->ml_post)
-		cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options/ReplyMode/List", FALSE);
-	
+
 	/* override from name according to folder properties */
 	if (msginfo->folder && msginfo->folder->prefs &&
 		msginfo->folder->prefs->reply_with_format &&
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -3348,13 +3348,10 @@ void main_create_mailing_list_menu (MainWindow *mainwin, MsgInfo *msginfo)
 	
 	if (msginfo) 
 		is_menu = mailing_list_create_submenu (mainwin, msginfo);
-	if (is_menu) {
+	if (is_menu)
 		cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/Message/MailingList", TRUE);
-		cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/Message/ReplyTo/List", TRUE);
-	} else {
+	else
 		cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/Message/MailingList", FALSE);
-		cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/Message/ReplyTo/List", FALSE);
-	}	
 }
 
 static gint mailing_list_create_submenu (MainWindow *mainwin, MsgInfo *msginfo)
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -1620,7 +1620,6 @@ GSList *summary_get_selected_msg_list(SummaryView *summaryview)
 void summary_set_menu_sensitive(SummaryView *summaryview)
 {
 	SensitiveCond state;
-	MsgInfo *msginfo;
 	gboolean sensitive;
 	gint i;
 
@@ -1696,15 +1695,6 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
 		cm_menu_set_sensitive_full(summaryview->mainwin->ui_manager, entry[i].entry, sensitive);
 	}
 
-#ifndef GENERIC_UMPC
-	if ((msginfo = summary_get_selected_msg(summaryview)) && msginfo->extradata)
-		cm_menu_set_sensitive_full(summaryview->mainwin->ui_manager,
-			"Menus/SummaryViewPopup/ReplyTo/MailingList", TRUE);
-	else
-		cm_menu_set_sensitive_full(summaryview->mainwin->ui_manager,
-			"Menus/SummaryViewPopup/ReplyTo/MailingList", FALSE);
-#endif
-
 	summary_lock(summaryview);
 #ifndef GENERIC_UMPC
 	if (summaryview->messageview