From 550ab8f8e7aaa369fc2a30d6da7bb2ec3603f647 Mon Sep 17 00:00:00 2001
From: Christoph Hohmann <reboot@gmx.ch>
Date: Fri, 12 Mar 2004 00:21:52 +0000
Subject: [PATCH 1/1] 0.9.10claws5

* src/folderview.c
        Add error requester when renaming a folder failed

* src/imap.c
        Check new FolderItem name for namespace seperator
        before renaming

(Closes Bug 443 Bad named IMAP folders won't be displayed)
---
 ChangeLog.claws  | 11 +++++++++++
 configure.ac     |  2 +-
 src/folder.h     |  8 +++++---
 src/folderview.c |  5 +++--
 src/imap.c       |  6 ++++++
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 766a32f76..ffa6d98ca 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,14 @@
+2004-03-12 [christoph]	0.9.10claws5
+
+	* src/folderview.c
+		Add error requester when renaming a folder failed
+
+	* src/imap.c
+		Check new FolderItem name for namespace seperator
+		before renaming
+
+	(Closes Bug 443 Bad named IMAP folders won't be displayed)
+
 2004-03-11 [christoph]	0.9.10claws4
 
 	* src/folder.[ch]
diff --git a/configure.ac b/configure.ac
index e64f706f0..bd05f3fa8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=4
+EXTRA_VERSION=5
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
diff --git a/src/folder.h b/src/folder.h
index 05bf262a1..0db7ea5b7 100644
--- a/src/folder.h
+++ b/src/folder.h
@@ -539,14 +539,16 @@ struct _FolderClass
 						 MsgInfo        *msginfo,
 						 MsgPermFlags	 newflags);
 	/**
-	 * Get the flags for a list of messages
+	 * Get the flags for a list of messages. Flags that are not supported
+	 * by the folder should be preserved. They can be copied from
+	 * \c msginfo->flags.perm_flags
 	 *
 	 * \param folder The \c Folder of the messages
 	 * \param item The \c FolderItem of the messages
 	 * \param msglist The list of \c MsgInfos for which the flags should
 	 *                   be returned
-	 * \param msgflags A \c GRelation for tuples of (message number,
-	 *                 permanent flags). Add tuples for the messages in msgnumlist
+	 * \param msgflags A \c GRelation for tuples of (MsgInfo, new permanent
+         *        flags for MsgInfo). Add tuples for the messages in msglist
 	 * \return 0 on success, a negative number otherwise
 	 */
 	gint		(*get_flags)		(Folder		*folder,
diff --git a/src/folderview.c b/src/folderview.c
index 053b3b690..f556f1d1a 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2106,13 +2106,14 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
 	}
 
 	Xstrdup_a(old_path, item->path, {g_free(new_folder); return;});
-	old_id = folder_item_get_identifier(item);
 
 	if (item->folder->klass->rename_folder(item->folder, item, new_folder) < 0) {
-		g_free(old_id);
+		alertpanel_error(_("The folder could not be renamed.\n"
+				   "The new folder name could not be allowed."));
 		return;
 	}
 
+	old_id = folder_item_get_identifier(item);
 	/* if (FOLDER_TYPE(item->folder) == F_MH)
 		prefs_filtering_rename_path(old_path, item->path); */
 	new_id = folder_item_get_identifier(item);
diff --git a/src/imap.c b/src/imap.c
index cec5ec158..def44b3c3 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -1717,6 +1717,12 @@ static gint imap_rename_folder(Folder *folder, FolderItem *item,
 	g_return_val_if_fail(item->path != NULL, -1);
 	g_return_val_if_fail(name != NULL, -1);
 
+	if (strchr(name, imap_get_path_separator(folder, item->path)) != NULL) {
+		g_warning(_("New folder name must not contain the namespace "
+			    "path seperator"));
+		return -1;
+	}
+
 	session = imap_session_get(folder);
 	if (!session) return -1;
 
-- 
2.25.1