From: Colin Leroy <colin@colino.net>
Date: Sat, 9 Nov 2002 23:44:37 +0000 (+0000)
Subject: fix the statusbar messages
X-Git-Tag: w0-1~30
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=3f8fec6849c5c1e55d2a6bd1abb1d3bcf122f73f

fix the statusbar messages
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 14a277c08..b0d45d8f4 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-11-09 [colin]	0.8.5claws113
+
+	* src/folder.c
+	  src/folderview.c
+		Fix the status bar messages
+
 2002-11-09 [colin]	0.8.5claws112
 
 	* src/folderview.c
diff --git a/configure.in b/configure.in
index 2edf0a178..01f0197c6 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws112
+EXTRA_VERSION=claws113
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/folder.c b/src/folder.c
index a572f4172..6c8e59813 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -1520,12 +1520,14 @@ FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
 	for (cur = mlist ; cur != NULL ; cur = cur->next) {
 		MsgInfo * msginfo;
 		cnt++;
-		msginfo = (MsgInfo *) cur->data;
-		folder_item_move_msg(new_item, msginfo);
 		if (cnt%500)
 			statusbar_print_all(_("Moving %s to %s (%d%%)..."), src->name, 
 					new_item->path,
 					100*cnt/g_slist_length(mlist));
+		msginfo = (MsgInfo *) cur->data;
+		folder_item_move_msg(new_item, msginfo);
+		if (cnt%500)
+			statusbar_pop_all();
 	}
 	
 	/*copy prefs*/
diff --git a/src/folderview.c b/src/folderview.c
index 0af73d551..63232a19f 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2660,22 +2660,21 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
 			else 
 				debug_print("can't remove src node: is null\n");
 
+			STATUSBAR_POP(folderview->mainwin);
 			folderview_create_folder_node_recursive(folderview, new_item);
 			folder_update_item(src_parent, TRUE);
 			folder_update_item_recursive(new_item, TRUE); 
 			folderview_sort_folders(folderview, 
 				gtk_ctree_find_by_row_data(GTK_CTREE(widget), 
 					NULL, new_item->parent), new_item->folder);
-			statusbar_pop_all();
 			folderview_select(folderview, new_item);
 		} else {
 			main_window_cursor_normal(folderview->mainwin);
 			gtk_drag_finish(drag_context, FALSE, FALSE, time);
-			statusbar_pop_all();
+			STATUSBAR_POP(folderview->mainwin);
 		}	
 		inc_unlock();		
 		gtk_widget_set_sensitive(folderview->ctree, TRUE);
-		statusbar_pop_all();
 	}
 }