CVS: sylpheedclaws/sylpheed-claws/src folder.c,1.213.2.127,1.213.2.128 folderview.c,1.207.2.139,1.207.2.140 imap.c,1.179.2.142,1.179.2.143 statusbar.c,1.5.2.12,1.5.2.13

Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src
In directory sunsite.dk:/tmp/cvs-serv1176/src

Modified Files:
      Tag: gtk2
	folder.c folderview.c imap.c statusbar.c 
Log Message:
2006-12-26 [colin]	2.6.1cvs76

	* src/folder.c
	* src/folderview.c
	* src/imap.c
	* src/statusbar.c
	* src/etpan/imap-thread.c
		Fix previous commit warnings
		Make statusbar update every second if total < 20
		Make IMAP APPEND faster by simplifying log		

Index: folder.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/folder.c,v
retrieving revision 1.213.2.127
retrieving revision 1.213.2.128
diff -u -d -r1.213.2.127 -r1.213.2.128
--- folder.c	2006/12/26 21:33:58	1.213.2.127
+++ folder.c	2006/12/26 22:37:38	1.213.2.128
@@ -2779,7 +2779,7 @@
 
         return lastnum;
 }
-		
+
 static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest, gboolean copy) 
 {
 	GSList *mlist;

Index: folderview.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/folderview.c,v
retrieving revision 1.207.2.139
retrieving revision 1.207.2.140
diff -u -d -r1.207.2.139 -r1.207.2.140
--- folderview.c	2006/12/26 21:33:59	1.207.2.139
+++ folderview.c	2006/12/26 22:37:38	1.207.2.140
@@ -2462,7 +2462,8 @@
 	gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), FALSE);
 	inc_lock();
 	main_window_cursor_wait(folderview->mainwin);
-	statusbar_verbosity_set(TRUE);
+
+	statusbar_verbosity_set(FALSE);
 	folder_item_update_freeze();
 	if ((status = folder_item_move_to(from_folder, to_folder, &new_folder, copy)) == F_MOVE_OK) {
 		statusbar_verbosity_set(FALSE);

Index: imap.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/imap.c,v
retrieving revision 1.179.2.142
retrieving revision 1.179.2.143
diff -u -d -r1.179.2.142 -r1.179.2.143
--- imap.c	2006/12/22 21:01:09	1.179.2.142
+++ imap.c	2006/12/26 22:37:39	1.179.2.143
@@ -1095,7 +1095,7 @@
 		gchar *real_file = NULL;
 		fileinfo = (MsgFileInfo *)cur->data;
 
-		statusbar_progress_all(curnum, total, 1);
+		statusbar_progress_all(curnum, total, total < 10 ? 1:10);
 		curnum++;
 
 		if (fileinfo->flags) {

Index: statusbar.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/statusbar.c,v
retrieving revision 1.5.2.12
retrieving revision 1.5.2.13
diff -u -d -r1.5.2.12 -r1.5.2.13
--- statusbar.c	2006/11/07 10:39:30	1.5.2.12
+++ statusbar.c	2006/12/26 22:37:40	1.5.2.13
@@ -161,14 +161,18 @@
 void statusbar_progress_all (gint done, gint total, gint step) 
 {
 	gchar buf[32];
-	if (total && done % step == 0) {
+	static time_t last_update = (time_t)NULL;
+	time_t now = time(NULL);
+	if (total && (now - last_update > 0 || total < 20)) {
 		g_snprintf(buf, sizeof(buf), "%d / %d", done, total);
 		gtk_progress_bar_set_text
 			(GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar), buf);
 		gtk_progress_bar_set_fraction
 			(GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar),
 			 (total == 0) ? 0 : (gfloat)done / (gfloat)total);
+		last_update = now;
 	} else if (total == 0) {
+		last_update = (time_t)NULL;
 		gtk_progress_bar_set_text
 			(GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar), "");
 		gtk_progress_bar_set_fraction