[evolution-mapi/gnome-2-30] Bug #608307 - Renaming a parent folder disappears sub folders

[Milan Crha <mcrha src gnome org>]

commit fdb8ee308f7d94d8d3aa002ef63392c5ad71c761
Author: Milan Crha <mcrha redhat com>
Date:   Tue Apr 13 15:44:07 2010 +0200

    Bug #608307 - Renaming a parent folder disappears sub folders

 src/camel/camel-mapi-store.c |   90 ++++++++++++++++++++++++------------------
 1 files changed, 52 insertions(+), 38 deletions(-)
---
diff --git a/src/camel/camel-mapi-store.c b/src/camel/camel-mapi-store.c
index ee6a3ee..45a7562 100644
--- a/src/camel/camel-mapi-store.c
+++ b/src/camel/camel-mapi-store.c
@@ -667,6 +667,55 @@ mapi_delete_folder(CamelStore *store, const char *folder_name, CamelException *e
 }
 
 static void 
+mapi_rename_folder_infos (CamelMapiStore *mapi_store, const gchar *old_name, const gchar *new_name)
+{
+	gint sz, i, olen;
+	CamelStoreInfo *si = NULL;
+
+	g_return_if_fail (mapi_store != NULL);
+	g_return_if_fail (old_name != NULL);
+	g_return_if_fail (new_name != NULL);
+
+	olen = strlen (old_name);
+	sz = camel_store_summary_count ((CamelStoreSummary*) mapi_store->summary);
+	for (i = 0; i < sz; i++) {
+		const gchar *full_name;
+
+		si = camel_store_summary_index ((CamelStoreSummary *) mapi_store->summary, i);
+		if (!si)
+			continue;
+
+		full_name = camel_mapi_store_info_full_name (mapi_store->summary, si);
+		if (full_name && g_str_has_prefix (full_name, old_name) && !g_str_equal (full_name, old_name) &&
+		    full_name [olen] == '/' && full_name [olen + 1] != '\0') {
+			/* it's a subfolder of old_name */
+			const gchar *fid = camel_mapi_store_info_folder_id (mapi_store->summary, si);
+
+			if (fid) {
+				gchar *new_full_name;
+
+				/* do not remove it from name_hash yet, because this function
+				   will be called for it again */
+				/* g_hash_table_remove (mapi_store->priv->name_hash, full_name); */
+				g_hash_table_remove (mapi_store->priv->id_hash, fid);
+
+				/* parent is still the same, only the path changed */
+				new_full_name = g_strconcat (new_name, full_name + olen + (g_str_has_suffix (new_name, "/") ? 1 : 0), NULL);
+
+				mapi_update_folder_hash_tables (mapi_store, new_full_name, fid, NULL);
+
+				camel_store_info_set_string ((CamelStoreSummary *)mapi_store->summary, si, CAMEL_STORE_INFO_PATH, new_full_name);
+				camel_store_info_set_string ((CamelStoreSummary *)mapi_store->summary, si, CAMEL_MAPI_STORE_INFO_FULL_NAME, new_full_name);
+				camel_store_summary_touch ((CamelStoreSummary *)mapi_store->summary);
+
+				g_free (new_full_name);
+			}
+		}
+		camel_store_summary_info_free ((CamelStoreSummary *)mapi_store->summary, si);
+	}
+}
+
+static void
 mapi_rename_folder(CamelStore *store, const char *old_name, const char *new_name, CamelException *ex)
 {
 	CamelMapiStore *mapi_store = CAMEL_MAPI_STORE (store);
@@ -747,6 +796,8 @@ mapi_rename_folder(CamelStore *store, const char *old_name, const char *new_name
 			return;
 		}
 
+		mapi_rename_folder_infos (mapi_store, old_name, new_name);
+
 		folder_id = g_strdup (old_fid_str);
 
 		/* this frees old_fid_str */
@@ -795,44 +846,7 @@ mapi_rename_folder(CamelStore *store, const char *old_name, const char *new_name
 		} else {
 			/* folder was moved, update all subfolders immediately, thus
 			   the next get_folder_info call will know about them */
-			gint sz, i;
-
-			sz = camel_store_summary_count ((CamelStoreSummary*) mapi_store->summary);
-			for (i = 0; i < sz; i++) {
-				const gchar *full_name;
-
-				si = camel_store_summary_index ((CamelStoreSummary *) mapi_store->summary, i);
-				if (!si)
-					continue;
-
-				full_name = camel_mapi_store_info_full_name (mapi_store->summary, si);
-				if (full_name && g_str_has_prefix (full_name, old_name) && !g_str_equal (full_name, old_name) &&
-				    full_name [strlen (old_name)] == '/' && full_name [strlen (old_name) + 1] != '\0') {
-					/* it's a subfolder of old_name */
-					const gchar *fid = camel_mapi_store_info_folder_id (mapi_store->summary, si);
-
-					if (fid) {
-						gchar *new_full_name;
-
-						/* do not remove it from name_hash yet, because this function
-						   will be called for it again */
-						/* g_hash_table_remove (priv->name_hash, full_name); */
-						g_hash_table_remove (priv->id_hash, fid);
-
-						/* parent is still the same, only the path changed */
-						new_full_name = g_strconcat (new_name, full_name + strlen (old_name) + (g_str_has_suffix (new_name, "/") ? 1 : 0), NULL);
-
-						mapi_update_folder_hash_tables (mapi_store, new_full_name, fid, NULL);
-
-						camel_store_info_set_string ((CamelStoreSummary *)mapi_store->summary, si, CAMEL_STORE_INFO_PATH, new_full_name);
-						camel_store_info_set_string ((CamelStoreSummary *)mapi_store->summary, si, CAMEL_MAPI_STORE_INFO_FULL_NAME, new_full_name);
-						camel_store_summary_touch ((CamelStoreSummary *)mapi_store->summary);
-
-						g_free (new_full_name);
-					}
-				}
-				camel_store_summary_info_free ((CamelStoreSummary *)mapi_store->summary, si);
-			}
+			mapi_rename_folder_infos (mapi_store, old_name, new_name);
 		}
 
 		folder_id = g_strdup (old_fid_str);