* src/folderview.c

	fix sync breakage so we don't pass invalid pointer types

diff --git a/ChangeLog.claws b/ChangeLog.claws
index c73846e7d6bd8d7c8414c762cf2a81067334ae90..4f878e1296974eb89ac6f575e237550a0944853e 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-02-15 [alfons]    0.9.9claws14
+
+       * src/folderview.c
+               fix sync breakage so we don't pass invalid pointer types
+
 2003-02-15 [match]     0.9.9claws13
 
        * src/ldapquery.[ch]

diff --git a/configure.ac b/configure.ac
index 0c8f9aa6c71586f018994079fa73c1ace9b3552b..385ed9e0802b2d04b8e8ef1c1fe35a1ff3c4c281 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=13
+EXTRA_VERSION=14
 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 c557cf94d608447b37dd70736c27662648a1b565..5982381b22e3cdea6abdf07c401ff96997ff620e 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -264,9 +264,8 @@ void folderview_create_folder_node       (FolderView       *folderview,
                                          FolderItem       *item);
 gboolean folderview_update_folder       (gpointer          source,
                                          gpointer          userdata);
-gboolean folderview_update_item                 (gpointer          source,
+gboolean folderview_update_item_claws   (gpointer          source,
                                          gpointer          data);
-
 static void folderview_processing_cb(FolderView *folderview, guint action,
                                     GtkWidget *widget);
 static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
@@ -528,7 +527,7 @@ FolderView *folderview_create(void)
        folderview->folder_update_callback_id =
                hooks_register_hook(FOLDER_UPDATE_HOOKLIST, folderview_update_folder, (gpointer) folderview);
        folderview->folder_item_update_callback_id =
-               hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item, (gpointer) folderview);
+               hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item_claws, (gpointer) folderview);
 
        gtk_widget_show_all(scrolledwin);
 
@@ -1260,7 +1259,32 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                folderview_update_node(folderview, node);
 }
 
-gboolean folderview_update_item(gpointer source, gpointer data)
+#if !CLAWS
+void folderview_update_item(FolderItem *item, gboolean update_summary)
+{
+       GList *list;
+       FolderView *folderview;
+       GtkCTree *ctree;
+       GtkCTreeNode *node;
+
+       g_return_if_fail(item != NULL);
+
+       for (list = folderview_list; list != NULL; list = list->next) {
+               folderview = (FolderView *)list->data;
+               ctree = GTK_CTREE(folderview->ctree);
+
+               node = gtk_ctree_find_by_row_data(ctree, NULL, item);
+               if (node) {
+                       folderview_update_node(folderview, node);
+                       if (update_summary && folderview->opened == node)
+                               summary_show(folderview->summaryview,
+                                            item, FALSE);
+               }
+       }
+}
+#endif
+
+gboolean folderview_update_item_claws(gpointer source, gpointer data)
 {
        FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
        FolderView *folderview = (FolderView *)data;
@@ -1284,16 +1308,34 @@ gboolean folderview_update_item(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)
 {
-       folderview_update_item((FolderItem *)key, (gboolean)data);
+       FolderItemUpdateParams *fum = (FolderItemUpdateParams *)data;
+       fum->data.item = (FolderItem *)key; 
+       folderview_update_item_claws(&fum->data, fum->folderview);
 }
 
 void folderview_update_item_foreach(GHashTable *table, gboolean update_summary)
 {
-       g_hash_table_foreach(table, folderview_update_item_foreach_func,
-                            (gpointer)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);
+       }
 }
 
 static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,