2008-08-29 [iwkse] 3.5.0cvs83
authorSalvatore De Paolis <iwkse@claws-mail.org>
Fri, 29 Aug 2008 18:54:13 +0000 (18:54 +0000)
committerSalvatore De Paolis <iwkse@claws-mail.org>
Fri, 29 Aug 2008 18:54:13 +0000 (18:54 +0000)
* src/summaryview.c
Disable "Move to trash" action if
we are in a trash-like folder.
Thanks to colinl

ChangeLog
PATCHSETS
configure.ac
src/summaryview.c

index 3b6740a0efb780eb4be8a8f9540d7c76990dbfcf..0c4c0e7b3d8c0846f4e8ecd0e781d71cc2ac4f65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-29 [iwkse]     3.5.0cvs83
+
+       * src/summaryview.c
+                       Disable "Move to trash" action if
+                       we are in a trash-like folder.
+                       Thanks to colinl
+
 2008-08-29 [paul]      3.5.0cvs82
 
        * configure.ac
index e137cbf7e1f6c2294b0189a1e156fbd6e82debd3..4467fed9be6d7c1c167d2fc98071c075ec4a16c8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/gtk/combobox.c;  ) > 3.5.0cvs80.patchset
 ( 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
index bfce658682c0c9a08e03dc988ced5d79557a2bcc..941baa1432339b9fe33bb01c905cce517a049040 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=82
+EXTRA_VERSION=83
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index a7ad9ee1062883b0c733028a6d1c08b660eaa222..c24a02c8d9ab8eef6bb1fd1ccea8e7adc0393fc7 100644 (file)
@@ -6411,6 +6411,9 @@ 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);
        } else if (event->button == 2) {