2004-09-28 [colin] 0.9.12cvs112.1
authorColin Leroy <colin@colino.net>
Tue, 28 Sep 2004 14:46:59 +0000 (14:46 +0000)
committerColin Leroy <colin@colino.net>
Tue, 28 Sep 2004 14:46:59 +0000 (14:46 +0000)
* src/folderview.c
* src/mainwindow.c
Sync with HEAD

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/folderview.c
src/mainwindow.c

index 54746008305cae80e89e663aa3fa2c9d32d84596..fbde76308b009c3a634db30658b960831e32b99e 100644 (file)
@@ -1,3 +1,9 @@
+2004-09-28 [colin]     0.9.12cvs112.1
+
+       * src/folderview.c
+       * src/mainwindow.c
+               Sync with HEAD
+
 2004-09-28 [colin]     0.9.12cvs110.1
 
        * src/folderview.c
index 365ca02c78cbbe97f74eddedbba42a05b9ef2399..5e59e395bc48d2283ad0082a3f1496b97b71bb15 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.149.2.15 -r 1.149.2.16 src/inc.c; ) > 0.9.12cvs106.1.patchset
 ( cvs diff -u -r 1.60.2.10 -r 1.60.2.11 src/addressbook.c; ) > 0.9.12cvs108.1.patchset
 ( cvs diff -u -r 1.207.2.15 -r 1.207.2.16 src/folderview.c; ) > 0.9.12cvs110.1.patchset
+( cvs diff -u -r 1.207.2.16 -r 1.207.2.17 src/folderview.c; cvs diff -u -r 1.274.2.19 -r 1.274.2.20 src/mainwindow.c; ) > 0.9.12cvs112.1.patchset
index 30c51b91af99bc56c71dca446e91ed23328c9d73..2a66735a8d434a4bc9ec78b7accabcff30835a19 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=110
+EXTRA_VERSION=112
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 
index 7c8e9f90b83309013cfb87d09af85135a1bf018a..10be00fea5bf6e452d0296a40d3f3ea1b59d6913 100644 (file)
@@ -1397,7 +1397,7 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
            gtk_item_factory_get_item(fpopup_factory, "/Empty trash...") == NULL) {
                gtk_item_factory_create_item(fpopup_factory, &folder_view_trash_popup_entries[0], folderview, 1);
                gtk_item_factory_create_item(fpopup_factory, &folder_view_trash_popup_entries[1], folderview, 1);
-       } else {
+       } else if (item != folder->trash) {
                gtk_item_factory_delete_entry(fpopup_factory, &folder_view_trash_popup_entries[0]);
                gtk_item_factory_delete_entry(fpopup_factory, &folder_view_trash_popup_entries[1]);
        }
index 7c65d6cd6c3f6d9ff0eac49ba064880c5d71a9bd..8d02541720d561da09f4c2d50ee55844a9f5e1d8 100644 (file)
@@ -438,7 +438,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_File/Change folder order"),      NULL, foldersort_cb,  0, NULL},
        {N_("/_File/_Import mbox file..."),     NULL, import_mbox_cb, 0, NULL},
        {N_("/_File/_Export to mbox file..."),  NULL, export_mbox_cb, 0, NULL},
-       {N_("/_File/Empty _trash"),             "<shift>D", empty_trash_cb, 0, NULL},
+       {N_("/_File/Empty all _Trash folders"), "<shift>D", empty_trash_cb, 0, NULL},
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_File/_Save as..."),              "<control>S", save_as_cb, 0, NULL},
        {N_("/_File/_Print..."),                NULL, print_cb, 0, NULL},
@@ -1715,7 +1715,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                 {"/File/Add mailbox/MH..."                   , M_UNLOCKED},
                {"/File/Change folder order"                  , M_UNLOCKED},
                {"/File/Export to mbox file..."               , M_UNLOCKED},
-               {"/File/Empty trash"                          , M_UNLOCKED},
+               {"/File/Empty all Trash folders"              , M_UNLOCKED},
                {"/File/Work offline"                         , M_UNLOCKED},
 
                {"/File/Save as...", M_TARGET_EXIST|M_UNLOCKED},