* src/folder.[ch]

* src/folderview.c
* src/mainwindow.c
        fix new folder ghost message bug
        (closes bug [ 619722 ] wrong count for newly created folders)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 33c848a3e87a37bb315dca17c34087d228c324cc..b9bf71a740b2085cafe3d6a32d278e3ecb55f0c4 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2002-10-07 [christoph] 0.8.3claws52
+
+       * src/folder.[ch]
+       * src/folderview.c
+       * src/mainwindow.c
+               fix new folder ghost message bug
+               (closes bug [ 619722 ] wrong count for newly created folders)
+
 2002-10-07 [christoph] 0.8.3claws51
 
        * src/compose.c

diff --git a/configure.in b/configure.in
index 41a11da9844d4bf686e01765a6551c5da9b9401c..c7804de130b4abb50c6c7d0b23b813f6b6a8bca6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ MINOR_VERSION=8
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws51
+EXTRA_VERSION=claws52
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/folder.c b/src/folder.c
index 71a780e8ff1e176bc05ceed0d3f04be707ff3d5d..a5bbe2624660f8eb7d59ad547bf91ae13876ebd3 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -451,6 +451,16 @@ void folder_scan_tree(Folder *folder)
        prefs_matcher_read_config();
 }
 
+FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
+{
+       FolderItem *new_item;
+
+       new_item = parent->folder->create_folder(parent->folder, parent, name);
+       new_item->cache = msgcache_new();
+
+       return new_item;
+}
+
 struct TotalMsgCount
 {
        guint new;
@@ -1700,7 +1710,7 @@ gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
 
        /* Read cache for dest folder */
        if (!dest->cache) folder_item_read_cache(dest);
-       
+
        /* 
         * Fetch new MsgInfos for new messages in dest folder,
         * add them to the msgcache and update folder message counts

diff --git a/src/folder.h b/src/folder.h
index f9f339d5a679761838a5159b2701bef402fb23e2..974c1ac2a9cfbb7283a7966f15450827419236aa 100644 (file)
--- a/src/folder.h
+++ b/src/folder.h
@@ -300,6 +300,7 @@ GList *folder_get_list              (void);
 gint   folder_read_list                (void);
 void   folder_write_list       (void);
 void   folder_scan_tree                (Folder *folder);
+FolderItem *folder_create_folder(FolderItem    *parent, const gchar *name);
 void   folder_update_op_count          (void);
 void   folder_func_to_all_folders      (FolderItemFunc function,
                                         gpointer data);

diff --git a/src/folderview.c b/src/folderview.c
index fd3b5af362beb2cf53f5c05108b5626b66acf27c..08bdd6f8e1c5e823d61a0460c660dee68fefaf44 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1865,7 +1865,7 @@ static void folderview_new_folder_cb(FolderView *folderview, guint action,
                return;
        }
 
-       new_item = item->folder->create_folder(item->folder, item, new_folder);
+       new_item = folder_create_folder(item, new_folder);
        if (!new_item) {
                alertpanel_error(_("Can't create the folder `%s'."), name);
                g_free(new_folder);
@@ -1921,7 +1921,7 @@ static void folderview_new_mbox_folder_cb(FolderView *folderview, guint action,
                return;
        }
 
-       new_item = item->folder->create_folder(item->folder, item, new_folder);
+       new_item = folder_create_folder(item, new_folder);
        g_free(new_folder);
        if (!new_item) return;
 
@@ -2233,7 +2233,7 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
                return;
        }
 
-       new_item = item->folder->create_folder(item->folder, item, new_folder);
+       new_item = folder_create_folder(item, new_folder);
        if (!new_item) {
                alertpanel_error(_("Can't create the folder `%s'."), name);
                g_free(new_folder);

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 5b58dd0bcfb3920bfad72b6cdfc5a817cc8b0235..b58f8d578f093eb848a5e019237aec1307024b63 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1558,11 +1558,11 @@ void main_window_add_mbox(MainWindow *mainwin)
        item->folder = folder;
        folder->node = g_node_new(item);
 
-       folder->create_folder(folder, item, "inbox");
-       folder->create_folder(folder, item, "outbox");
-       folder->create_folder(folder, item, "queue");
-       folder->create_folder(folder, item, "draft");
-       folder->create_folder(folder, item, "trash");
+       folder_create_folder(item, "inbox");
+       folder_create_folder(item, "outbox");
+       folder_create_folder(item, "queue");
+       folder_create_folder(item, "draft");
+       folder_create_folder(item, "trash");
 
        folderview_set(mainwin->folderview);
 }