diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/folderview.c | 6 | ||||
-rw-r--r-- | src/mainwindow.c | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/folderview.c b/src/folderview.c index 8349b9e5..5a903324 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -1605,8 +1605,10 @@ static gboolean folderview_menu_popup(FolderView *folderview, rename_folder = delete_folder = TRUE; if (folder->klass->move_folder) move_folder = TRUE; - } else if (item->stype == F_TRASH) - empty_trash = TRUE; + } else if (item->stype == F_TRASH) { + if (item->total > 0) + empty_trash = TRUE; + } } else if (FOLDER_TYPE(folder) == F_NEWS) { if (item->parent != NULL) delete_folder = TRUE; diff --git a/src/mainwindow.c b/src/mainwindow.c index e42f6f89..632355de 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -1616,6 +1616,9 @@ void main_window_empty_trash(MainWindow *mainwin, gboolean confirm) { GList *list; + if (!procmsg_trash_messages_exist()) + return; + if (confirm) { if (alertpanel(_("Empty all trash"), _("Delete all messages in trash folders?"), |