* src/folder.c

* src/mainwindow.c
        fix folder_item_remove_all_msg and folderview
        status for trash folders after emptying trash

diff --git a/ChangeLog.claws b/ChangeLog.claws
index f49465435ddcb68dc12f7da103eddeaf8fbe456f..7bf129ccb23954130fca7aaedc46757bf9c87f47 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-07-06 [christoph] 0.7.8claws49
+
+       * src/folder.c
+       * src/mainwindow.c
+               fix folder_item_remove_all_msg and folderview
+               status for trash folders after emptying trash
+
 2002-07-05 [paul]      0.7.8claws48
 
        * sync with 0.7.8cvs16

diff --git a/configure.in b/configure.in
index ca0e5a0c9a4363407b253d6b9b7267aa61df6e67..884699f03548bf1b7a2f537f24f16139cdd18eb8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws48
+EXTRA_VERSION=claws49
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/folder.c b/src/folder.c
index f77cf8e7f1c08217d5805c6bda8d293eb80dafcc..53caa2eacb93bb534ab90cc032457fcdc35c5411 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -1611,6 +1611,13 @@ gint folder_item_remove_all_msg(FolderItem *item)
        if (result == 0) {
                if (folder->finished_remove)
                        folder->finished_remove(folder, item);
+
+               folder_item_free_cache(item);
+               item->cache = msgcache_new();
+
+               item->new = 0;
+               item->unread = 0;
+               item->total = 0;
        }
 
        return result;

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 04582ce2be4b6cf60849b63a14f4bf4d53a1a725..3c27ed02a876bd312271edbb7ec091ca3d296aef 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1436,7 +1436,7 @@ void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
 
        for (list = folder_get_list(); list != NULL; list = list->next) {
                folder = list->data;
-               if (folder && folder->trash && folder->trash->total != 0) {
+               if (folder && folder->trash) {
                        folderview_update_item(folder->trash, TRUE);
                }
        }