2007-08-27 [colin] 2.10.0cvs177

	* src/folder_item_prefs.c
	* src/folder_item_prefs.h
	* src/imap_gtk.c
	* src/mh_gtk.c
		Fix loss of subfolders properties when
		renaming a folder

diff --git a/ChangeLog b/ChangeLog
index 85fe5c20815945a455f421be7acdf17639a88b1d..b572638213b029235228d7bdfd52e489d7696056 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-08-27 [colin]     2.10.0cvs177
+
+       * src/folder_item_prefs.c
+       * src/folder_item_prefs.h
+       * src/imap_gtk.c
+       * src/mh_gtk.c
+               Fix loss of subfolders properties when
+               renaming a folder
+
 2007-08-26 [wwp]       2.10.0cvs176
 
        * src/alertpanel.c

diff --git a/PATCHSETS b/PATCHSETS
index cf07fecd95b5a5c1cf63598c0a9ef1cd8a536d5f..360c2fa89cc09d8483b0dcb88db677ab86336b2a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2831,3 +2831,4 @@
 ( cvs diff -u -r 1.17.2.36 -r 1.17.2.37 src/alertpanel.c;  cvs diff -u -r 1.94.2.147 -r 1.94.2.148 src/messageview.c;  cvs diff -u -r 1.60.2.48 -r 1.60.2.49 src/prefs_actions.c;  cvs diff -u -r 1.6.2.16 -r 1.6.2.17 src/common/log.c;  ) > 2.10.0cvs174.patchset
 ( cvs diff -u -r 1.60.2.49 -r 1.60.2.50 src/prefs_actions.c;  ) > 2.10.0cvs175.patchset
 ( cvs diff -u -r 1.17.2.37 -r 1.17.2.38 src/alertpanel.c;  cvs diff -u -r 1.94.2.148 -r 1.94.2.149 src/messageview.c;  cvs diff -u -r 1.60.2.50 -r 1.60.2.51 src/prefs_actions.c;  ) > 2.10.0cvs176.patchset
+( cvs diff -u -r 1.2.2.22 -r 1.2.2.23 src/folder_item_prefs.c;  cvs diff -u -r 1.2.2.11 -r 1.2.2.12 src/folder_item_prefs.h;  cvs diff -u -r 1.1.2.49 -r 1.1.2.50 src/imap_gtk.c;  cvs diff -u -r 1.2.2.27 -r 1.2.2.28 src/mh_gtk.c;  ) > 2.10.0cvs177.patchset

diff --git a/configure.ac b/configure.ac
index 4828396d0028bf93e2d8af2e73778dddadc8e630..0036a58b8002c6566ebc9facbba4efc8a2bdfd4d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=176
+EXTRA_VERSION=177
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder_item_prefs.c b/src/folder_item_prefs.c
index 2f936236757f917c6544d34882bace70b9c505f3..b5ac2e790b45d15d99385a135bc55eb096b05f08 100644 (file)
--- a/src/folder_item_prefs.c
+++ b/src/folder_item_prefs.c
@@ -167,7 +167,7 @@ void folder_item_prefs_save_config(FolderItem * item)
        tmp_prefs = * item->prefs;
 
        id = folder_item_get_identifier(item);
-
+       debug_print("saving prefs for %s\n", id?id:"(null)");
        prefs_write_config(param, id, FOLDERITEM_RC);
        g_free(id);
 
@@ -175,6 +175,21 @@ void folder_item_prefs_save_config(FolderItem * item)
         */
 }
 
+static gboolean folder_item_prefs_save_config_func(GNode *node, gpointer data)
+{
+       FolderItem *item = (FolderItem *) node->data;
+       folder_item_prefs_save_config(item);
+       return FALSE;
+}
+
+void folder_item_prefs_save_config_recursive(FolderItem * item)
+{      
+       gchar * id;
+
+       g_node_traverse(item->node, G_PRE_ORDER, G_TRAVERSE_ALL,
+                       -1, folder_item_prefs_save_config_func, NULL);
+}
+
 static FolderItemPrefs *folder_item_prefs_clear(FolderItemPrefs *prefs)
 {
        prefs->sort_by_number = FALSE;

diff --git a/src/folder_item_prefs.h b/src/folder_item_prefs.h
index ce622c722ace8067fc8e446065ecfc30186e6fce..7973cf9a91c781ebaffdcfbb4c8744791ab6891a 100644 (file)
--- a/src/folder_item_prefs.h
+++ b/src/folder_item_prefs.h
@@ -82,6 +82,7 @@ struct _FolderItemPrefs {
 
 void folder_item_prefs_read_config(FolderItem * item);
 void folder_item_prefs_save_config(FolderItem * item);
+void folder_item_prefs_save_config_recursive(FolderItem * item);
 FolderItemPrefs *folder_item_prefs_new(void);
 void folder_item_prefs_free(FolderItemPrefs * prefs);
 void folder_item_prefs_copy_prefs(FolderItem * src, FolderItem * dest);

diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index ad247b7458b32a31f8f22d07589a078adbc5b910..ab3a55ec30001d73b1ef6af1b70faf002bbdd5c8 100644 (file)
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -257,7 +257,7 @@ static void rename_folder_cb(FolderView *folderview, guint action,
        g_free(old_id);
        g_free(new_id);
 
-       folder_item_prefs_save_config(item);
+       folder_item_prefs_save_config_recursive(item);
        folder_write_list();
 }
 

diff --git a/src/mh_gtk.c b/src/mh_gtk.c
index c7f55ae84c5e8fe8126e9bca9df6d6c5b1839d92..98457eb7904d65306e8a04adc44423970a9882ca 100644 (file)
--- a/src/mh_gtk.c
+++ b/src/mh_gtk.c
@@ -267,7 +267,7 @@ static void rename_folder_cb(FolderView *folderview, guint action,
        g_free(old_id);
        g_free(new_id);
 
-       folder_item_prefs_save_config(item);
+       folder_item_prefs_save_config_recursive(item);
        folder_write_list();
 }