From a0a9b1425f31d9c19335d8f14308bd4d45eb01b1 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 28 Sep 2004 14:46:59 +0000 Subject: [PATCH] 2004-09-28 [colin] 0.9.12cvs112.1 * src/folderview.c * src/mainwindow.c Sync with HEAD --- ChangeLog-gtk2.claws | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/folderview.c | 2 +- src/mainwindow.c | 4 ++-- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 547460083..fbde76308 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -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 diff --git a/PATCHSETS b/PATCHSETS index 365ca02c7..5e59e395b 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -180,3 +180,4 @@ ( 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 diff --git a/configure.ac b/configure.ac index 30c51b91a..2a66735a8 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/folderview.c b/src/folderview.c index 7c8e9f90b..10be00fea 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -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]); } diff --git a/src/mainwindow.c b/src/mainwindow.c index 7c65d6cd6..8d0254172 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -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"), "D", empty_trash_cb, 0, NULL}, + {N_("/_File/Empty all _Trash folders"), "D", empty_trash_cb, 0, NULL}, {N_("/_File/---"), NULL, NULL, 0, ""}, {N_("/_File/_Save as..."), "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}, -- 2.25.1