* src/folder.c
authorColin Leroy <colin@colino.net>
Wed, 11 Dec 2002 15:26:31 +0000 (15:26 +0000)
committerColin Leroy <colin@colino.net>
Wed, 11 Dec 2002 15:26:31 +0000 (15:26 +0000)
remove statusbar stuff
  src/folderview.c
   set statusbar verbosity when moving folders

ChangeLog.claws
configure.in
src/folder.c
src/folderview.c

index 7dded1b..db77f27 100644 (file)
@@ -1,3 +1,10 @@
+2002-12-11 [colin]       0.8.6claws101
+
+       * src/folder.c
+               remove statusbar stuff
+         src/folderview.c
+               set statusbar verbosity when moving folders
+
 2002-12-11 [colin]       0.8.6claws100
         * src/prefs_filtering.c
         * src/prefs_matcher.c
 2002-12-11 [colin]       0.8.6claws100
         * src/prefs_filtering.c
         * src/prefs_matcher.c
index c43898c..ee31140 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws100
+EXTRA_VERSION=claws101
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 1bcc1c1..de8a42c 100644 (file)
@@ -47,7 +47,6 @@
 #include "scoring.h"
 #include "prefs_folder_item.h"
 #include "procheader.h"
 #include "scoring.h"
 #include "prefs_folder_item.h"
 #include "procheader.h"
-#include "statusbar.h"
 #include "hooks.h"
 #include "log.h"
 
 #include "hooks.h"
 #include "log.h"
 
@@ -1536,7 +1535,6 @@ FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
                new_item->folder = dest->folder;
 
        /* move messages */
                new_item->folder = dest->folder;
 
        /* move messages */
-       statusbar_verbosity_set(TRUE);
        for (cur = mlist ; cur != NULL ; cur = cur->next) {
                MsgInfo * msginfo;
                cnt++;
        for (cur = mlist ; cur != NULL ; cur = cur->next) {
                MsgInfo * msginfo;
                cnt++;
@@ -1549,7 +1547,6 @@ FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
 
                procmsg_msginfo_free(msginfo);
        }
 
                procmsg_msginfo_free(msginfo);
        }
-       statusbar_verbosity_set(FALSE);
        
        /*copy prefs*/
        prefs_folder_item_copy_prefs(src, new_item);
        
        /*copy prefs*/
        prefs_folder_item_copy_prefs(src, new_item);
index b4f97d9..2797094 100644 (file)
@@ -2584,7 +2584,9 @@ static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
        gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), FALSE);
        inc_lock();
        main_window_cursor_wait(folderview->mainwin);
        gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), FALSE);
        inc_lock();
        main_window_cursor_wait(folderview->mainwin);
+       statusbar_verbosity_set(TRUE);
        if ((status = folder_item_move_to(from_folder, to_folder, &new_folder)) == F_MOVE_OK) {
        if ((status = folder_item_move_to(from_folder, to_folder, &new_folder)) == F_MOVE_OK) {
+               statusbar_verbosity_set(FALSE);
                main_window_cursor_normal(folderview->mainwin);
                STATUSBAR_POP(folderview->mainwin);
                if (src_node)
                main_window_cursor_normal(folderview->mainwin);
                STATUSBAR_POP(folderview->mainwin);
                if (src_node)
@@ -2600,6 +2602,7 @@ static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
                                NULL, new_folder->parent), new_folder->folder);
                folderview_select(folderview, new_folder);
        } else {
                                NULL, new_folder->parent), new_folder->folder);
                folderview_select(folderview, new_folder);
        } else {
+               statusbar_verbosity_set(FALSE);         
                main_window_cursor_normal(folderview->mainwin);
                STATUSBAR_POP(folderview->mainwin);
                switch (status) {
                main_window_cursor_normal(folderview->mainwin);
                STATUSBAR_POP(folderview->mainwin);
                switch (status) {