0.9.4claws71

* src/compose.c
        replace '\n' and '\r' before removing trailing spaces

* src/folder.[ch]
* src/folderview.c
        add information about new or removed items in folder tree change
        notification and use this in folderview to add and remove only
        the appected items and not refresh the whole tree

diff --git a/ChangeLog.claws b/ChangeLog.claws
index ec4ab23a87b06c2f7504958aefeb80d73a960c48..6dd6672b79098f796548527ec2a4d456e3d636be 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,4 +1,16 @@
+2003-09-07 [christoph] 0.9.4claws71
+
+       * src/compose.c
+               replace '\n' and '\r' before removing trailing spaces
+
+       * src/folder.[ch]
+       * src/folderview.c
+               add information about new or removed items in folder tree change
+               notification and use this in folderview to add and remove only
+               the appected items and not refresh the whole tree
+
 2003-09-07 [match]     0.9.4claws70
+
        * src/Makefile.am
        * src/addr_compl.c
        * src/addressbook.c

diff --git a/configure.ac b/configure.ac
index 68ac3859d4c3eb4e3b7bb769cfbb8b00676d7f98..a4e885cfaad1c32313585327501b330e1bbdd546 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=70
+EXTRA_VERSION=71
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/compose.c b/src/compose.c
index b8d99c5d1b5f7a2c7928d9d8308ee71a34bc9646..df9d2f1432cdac082f8fd78f7d572bdaae91cb54 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -4396,9 +4396,9 @@ static void compose_convert_header(gchar *dest, gint len, gchar *src,
 
        if (len < 1) return;
 
-       g_strchomp(src);
        subst_char(src, '\n', ' ');
        subst_char(src, '\r', ' ');
+       g_strchomp(src);
 
        conv_encode_header(dest, len, src, header_len, addr_field);
 }

diff --git a/src/folder.c b/src/folder.c
index 32715219cbcacbf25f8ba69902d67e1c47459115..4607c41b49e0c4e52e88da9ac3e0bc5187f64c05 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -229,13 +229,16 @@ void folder_item_append(FolderItem *parent, FolderItem *item)
        item->node = g_node_append_data(parent->node, item);
 
        hookdata.folder = item->folder;
-       hookdata.update_flags = FOLDER_TREE_CHANGED;
+       hookdata.update_flags = FOLDER_TREE_CHANGED | FOLDER_NEW_FOLDERITEM;
+       hookdata.item = item;
        hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
 }
 
 static gboolean folder_item_remove_func(GNode *node, gpointer data)
 {
        FolderItem *item = FOLDER_ITEM(node->data);
+       FolderUpdateData hookdata;
+       Folder *folder = item->folder;
 
        if (item->cache != NULL) {
                msgcache_destroy(item->cache);
@@ -243,14 +246,18 @@ static gboolean folder_item_remove_func(GNode *node, gpointer data)
        }
 
        folder_item_destroy(item);
+
+       hookdata.folder = folder;
+       hookdata.update_flags = FOLDER_TREE_CHANGED | FOLDER_REMOVE_FOLDERITEM;
+       hookdata.item = item;
+       hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+
        return FALSE;
 }
 
 void folder_item_remove(FolderItem *item)
 {
-       Folder *folder = item->folder;
        GNode *node;
-       FolderUpdateData hookdata;
 
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
@@ -264,10 +271,6 @@ void folder_item_remove(FolderItem *item)
        g_node_traverse(node, G_POST_ORDER, G_TRAVERSE_ALL, -1,
                        folder_item_remove_func, NULL);
        g_node_destroy(node);
-
-       hookdata.folder = folder;
-       hookdata.update_flags = FOLDER_TREE_CHANGED;
-       hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
 }
 
 void folder_item_remove_children(FolderItem *item)
@@ -486,6 +489,7 @@ void folder_scan_tree(Folder *folder)
 
        hookdata.folder = folder;
        hookdata.update_flags = FOLDER_TREE_CHANGED;
+       hookdata.item = NULL;
        hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
 
        g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_scan_tree_func, pptable);

diff --git a/src/folder.h b/src/folder.h
index 4670ea54162b0c19f073a0121eaf92ffa1c02731..c352228dfe90eb2d27431d1ac3dbabf5af366164 100644 (file)
--- a/src/folder.h
+++ b/src/folder.h
@@ -110,11 +110,8 @@ typedef enum
 typedef enum
 {
        FOLDER_TREE_CHANGED = 1 << 0,
-/*
-       maybe enhance with:
-       FOLDER_NEW_FOLDERITEM
-       FOLDER_REMOVE_FOLDERITEM
-*/
+       FOLDER_NEW_FOLDERITEM = 1 << 1,
+       FOLDER_REMOVE_FOLDERITEM = 1 << 2,
 } FolderUpdateFlags;
 
 typedef enum
@@ -332,9 +329,7 @@ struct _FolderUpdateData
 {
        Folder                  *folder;
        FolderUpdateFlags        update_flags;
-/*
-       FolderItem              *item
-*/
+       FolderItem              *item;
 };
 
 struct _FolderItemUpdateData

diff --git a/src/folderview.c b/src/folderview.c
index e22884f0f63259c12114bae0e9c8e01a07fbd575..0423c0a2e7aaf47b8fc035eff201d5dc623c9bb1 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2769,9 +2769,15 @@ gboolean folderview_update_folder(gpointer source, gpointer userdata)
        ctree = folderview->ctree;
        g_return_val_if_fail(ctree != NULL, FALSE);
 
-       if (hookdata->update_flags & FOLDER_TREE_CHANGED) {
+       if (hookdata->update_flags & FOLDER_NEW_FOLDERITEM)
+               folderview_create_folder_node(folderview, hookdata->item);
+       else if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM) {
+               GtkCTreeNode *node;
+
+               node = gtk_ctree_find_by_row_data(GTK_CTREE(ctree), NULL, hookdata->item);
+               gtk_ctree_remove_node(GTK_CTREE(ctree), node);
+       } else if (hookdata->update_flags & FOLDER_TREE_CHANGED)
                folderview_set(folderview);
-       }
 
        return FALSE;
 }