From 5608d883ba2d5726954b5cdea47a1ac3c8673800 Mon Sep 17 00:00:00 2001
From: Alfons Hoogervorst <alfons@proteus.demon.nl>
Date: Mon, 16 Feb 2004 15:06:14 +0000
Subject: [PATCH 1/1] * src/folderview.c 	refine previous commit to make
 sure other hook functions 	get their grab of the pie too

---
 ChangeLog.claws  |  6 ++++++
 configure.ac     |  2 +-
 src/folderview.c | 32 +++++++++++---------------------
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 4f878e129..483c0377b 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2003-02-15 [alfons]	0.9.9claws15
+
+	* src/folderview.c
+		refine previous commit to make sure other hook functions
+		get their grab of the pie too
+
 2003-02-15 [alfons]	0.9.9claws14
 
 	* src/folderview.c
diff --git a/configure.ac b/configure.ac
index 385ed9e08..6be1b5335 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
diff --git a/src/folderview.c b/src/folderview.c
index 5982381b2..b41035864 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1259,7 +1259,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 		folderview_update_node(folderview, node);
 }
 
-#if !CLAWS
+#if !CLAWS /* keep it here for syncs */
 void folderview_update_item(FolderItem *item, gboolean update_summary)
 {
 	GList *list;
@@ -1308,34 +1308,24 @@ gboolean folderview_update_item_claws(gpointer source, gpointer data)
 	return FALSE;
 }
 
-typedef struct FolderItemUpdateParams {
-	FolderView	    *folderview;
-	FolderItemUpdateData data;
-} FolderItemUpdateParams;
-
 static void folderview_update_item_foreach_func(gpointer key, gpointer val,
 						gpointer data)
 {
-	FolderItemUpdateParams *fum = (FolderItemUpdateParams *)data;
-	fum->data.item = (FolderItem *)key; 
-	folderview_update_item_claws(&fum->data, fum->folderview);
+	/* CLAWS: share this joy with other hook functions ... */
+	folder_item_update((FolderItem *)key, 
+			   (FolderItemUpdateFlags)GPOINTER_TO_INT(data));
 }
 
 void folderview_update_item_foreach(GHashTable *table, gboolean update_summary)
 {
 	GList *list;
-
-	for (list = folderview_list; list != NULL; list = list->next) {
-		FolderItemUpdateParams data;
-		
-		data.folderview = (FolderView *)list->data;
-		/* FIXME: update_summary means update everything here? */
-		data.data.item = NULL;
-		data.data.update_flags = (update_summary 
-			? F_ITEM_UPDATE_CONTENT | F_ITEM_UPDATE_MSGCNT 
-			: 0);
-		g_hash_table_foreach(table, folderview_update_item_foreach_func, &data);
-	}
+	FolderItemUpdateFlags flags;
+	
+	flags = update_summary ?  F_ITEM_UPDATE_CONTENT | F_ITEM_UPDATE_MSGCNT
+		: 0;
+	for (list = folderview_list; list != NULL; list = list->next)
+		g_hash_table_foreach(table, folderview_update_item_foreach_func, 
+				     GINT_TO_POINTER(flags));
 }
 
 static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
-- 
2.25.1