2004-09-28 [colin] 0.9.12cvs112
authorColin Leroy <colin@colino.net>
Tue, 28 Sep 2004 14:41:26 +0000 (14:41 +0000)
committerColin Leroy <colin@colino.net>
Tue, 28 Sep 2004 14:41:26 +0000 (14:41 +0000)
* src/mainwindow.c
Put back mnemonic
* src/folderview.c
Fix Empty trash being visible-invisible-visible...

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

index 1467167..2343913 100644 (file)
@@ -1,3 +1,10 @@
+2004-09-28 [colin]     0.9.12cvs112
+
+       * src/mainwindow.c
+               Put back mnemonic
+       * src/folderview.c
+               Fix Empty trash being visible-invisible-visible...
+
 2004-09-28 [colin]     0.9.12cvs111
 
        * src/mainwindow.c
index 2f68b7a..e4b2c1e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -94,3 +94,4 @@
 ( cvs diff -u -r 1.306 -r 1.307 src/mainwindow.c; ) > 0.9.12cvs109.patchset
 ( cvs diff -u -r 1.246 -r 1.247 src/folderview.c; cvs diff -u -r 1.307 -r 1.308 src/mainwindow.c; ) > 0.9.12cvs110.patchset
 ( cvs diff -u -r 1.308 -r 1.309 src/mainwindow.c; ) > 0.9.12cvs111.patchset
+( cvs diff -u -r 1.309 -r 1.310 src/mainwindow.c; cvs diff -u -r 1.247 -r 1.248 src/folderview.c; ) > 0.9.12cvs112.patchset
index ccdaacc..08b481e 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=111
+EXTRA_VERSION=112
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
index 205129d..921ea3f 100644 (file)
@@ -1390,7 +1390,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
            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 8ccf41d..c89fd69 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 all Trash folders"),  "<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},