talons

commit 4ed82d0cef90962b627298c5c9c765a462022d28
parent a1fb412d44b4bf8f226862b330faa0221933f3c7
Author: Salvatore De Paolis <iwkse@claws-mail.org>
Date:   Fri, 29 Aug 2008 21:44:58 +0000

2008-08-29 [iwkse]	3.5.0cvs84

	* src/summaryview.c
			Bit of clean:)

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/summaryview.c
 | 
2
--

4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-29 [iwkse]	3.5.0cvs84
+
+	* src/summaryview.c
+			Bit of clean:)
+
 2008-08-29 [iwkse]	3.5.0cvs83
 
 	* src/summaryview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3495,3 +3495,4 @@
 ( cvs diff -u -r 1.61.2.83 -r 1.61.2.84 src/account.c;  cvs diff -u -r 1.56.2.62 -r 1.56.2.63 src/pop.c;  cvs diff -u -r 1.105.2.143 -r 1.105.2.144 src/prefs_account.c;  cvs diff -u -r 1.49.2.38 -r 1.49.2.39 src/prefs_account.h;  ) > 3.5.0cvs81.patchset
 ( cvs diff -u -r 1.654.2.3555 -r 1.654.2.3556 configure.ac;  ) > 3.5.0cvs82.patchset
 ( cvs diff -u -r 1.395.2.384 -r 1.395.2.385 src/summaryview.c;  ) > 3.5.0cvs83.patchset
+( cvs diff -u -r 1.395.2.385 -r 1.395.2.386 src/summaryview.c;  ) > 3.5.0cvs84.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=83
+EXTRA_VERSION=84
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -6411,8 +6411,6 @@ static gboolean summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
 	if (event->button == 3) {
 		summaryview->display_msg = messageview_is_visible(summaryview->messageview);
 		/* right clicked */
-
-		/* disable "Move to trash" action if we are in a Trash-like folder */
 		cm_menu_set_sensitive("SummaryViewPopup/Trash", !folder_has_parent_of_type(summaryview->folder_item, F_TRASH));
 		gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
 			       NULL, NULL, event->button, event->time);