sync with sylpheed 0.6.5cvs21
authorPaul Mangan <paul@claws-mail.org>
Tue, 4 Dec 2001 09:10:36 +0000 (09:10 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 4 Dec 2001 09:10:36 +0000 (09:10 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/folder.c
src/main.c

index d539299..ee17922 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-04
+
+       * src/folder.c:
+         folder_count_total_msgs()
+         folder_count_total_msgs_func(): use g_node_traverse() to traverse
+         GNode.
+
 2001-12-03
 
        * src/compose.c: fixed a bug that empty body was refused.
index c44ad7c..3bbac2c 100644 (file)
@@ -1,4 +1,9 @@
-2001-03-12 [christoph] 0.6.5claws48
+2001-12-04 [paul]      0.6.5claws49
+
+       * sync with sylpheed 0.6.5cvs21
+               see ChangeLog entry 2001-12-04
+
+2001-12-03 [christoph] 0.6.5claws48
 
        * po/de.po
                changed translation of undo
index 92fed63..e737c95 100644 (file)
@@ -1,3 +1,10 @@
+2001-12-04
+
+       * src/folder.c:
+         folder_count_total_msgs()
+         folder_count_total_msgs_func(): g_node_traverse() ¤ò»ÈÍѤ·¤Æ
+         GNode ¤ò¥È¥é¥Ð¡¼¥¹¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
 2001-12-03
 
        * src/compose.c: ¶õ¤ÎËÜʸ¤¬µñÈݤµ¤ì¤ë¥Ð¥°¤ò½¤Àµ¡£
index aa221e3..ecb7863 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws48
+EXTRA_VERSION=claws49
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
index 824ad98..c45262f 100644 (file)
@@ -371,16 +371,15 @@ struct TotalMsgCount
 static gboolean folder_count_total_msgs_func(GNode *node, gpointer data)
 {
        FolderItem *item;
-       struct TotalMsgCount *totalmsgcount;
+       struct TotalMsgCount *count = (struct TotalMsgCount *)data;
 
        g_return_val_if_fail(node->data != NULL, FALSE);
 
-       totalmsgcount = (struct TotalMsgCount *)data;
        item = FOLDER_ITEM(node->data);
-       totalmsgcount->new += item->new;
-       totalmsgcount->unread += item->unread;
-       totalmsgcount->total += item->total;
-       
+       count->new += item->new;
+       count->unread += item->unread;
+       count->total += item->total;
+
        return FALSE;
 }
 
@@ -388,26 +387,24 @@ void folder_count_total_msgs(guint *new, guint *unread, guint *total)
 {
        GList *list;
        Folder *folder;
-       struct TotalMsgCount totalmsgcount;
+       struct TotalMsgCount count;
 
-       debug_print(_("Counting total number of messages...\n"));
+       count.new = count.unread = count.total = 0;
 
-       totalmsgcount.new = 0;
-       totalmsgcount.unread = 0;
-       totalmsgcount.total = 0;
+       debug_print(_("Counting total number of messages...\n"));
 
        for (list = folder_list; list != NULL; list = list->next) {
                folder = FOLDER(list->data);
-               if(folder->node)
+               if (folder->node)
                        g_node_traverse(folder->node, G_PRE_ORDER,
-                               G_TRAVERSE_ALL, -1,
-                               folder_count_total_msgs_func,
-                               &totalmsgcount);
+                                       G_TRAVERSE_ALL, -1,
+                                       folder_count_total_msgs_func,
+                                       &count);
        }
 
-       *new = totalmsgcount.new;
-       *unread = totalmsgcount.unread;
-       *total = totalmsgcount.total;
+       *new = count.new;
+       *unread = count.unread;
+       *total = count.total;
 
        return;
 }
index 414b1f3..0858aa5 100644 (file)
@@ -197,7 +197,7 @@ int main(int argc, char *argv[])
        if (lock_socket < 0) return 0;
 
        if (cmd.status) {
-               puts("0 Sylpheed not running.\n");
+               puts("0 Sylpheed not running.");
                return 0;
        }