? mail/evolution-mail-2.0.schemas
? mail/ma.diff
? mail/default/zh_CN/Makefile
? mail/default/zh_CN/Makefile.in
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3532
diff -u -p -r1.3532 ChangeLog
--- mail/ChangeLog	18 Jan 2005 05:32:19 -0000	1.3532
+++ mail/ChangeLog	18 Jan 2005 05:32:56 -0000
@@ -1,5 +1,10 @@
 2005-01-18  Not Zed  <NotZed@Ximian.com>
 
+	** See bug #71105.
+
+	* em-folder-tree.c (emft_popup_rename_folder): dont let a user
+	rename a folder to one including '/'.
+
 	* em-format-html.c (emfh_gethttp): kill old 'load http 0 now=0' debug.
 
 	** See bug #70563.
Index: mail/em-folder-tree.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-tree.c,v
retrieving revision 1.139
diff -u -p -r1.139 em-folder-tree.c
--- mail/em-folder-tree.c	11 Jan 2005 06:17:23 -0000	1.139
+++ mail/em-folder-tree.c	18 Jan 2005 05:32:57 -0000
@@ -2664,7 +2664,11 @@ emft_popup_rename_folder (EPopup *ep, EP
 	prompt = g_strdup_printf (_("Rename the \"%s\" folder to:"), name);
 	while (!done) {
 		new_name = e_request_string (NULL, _("Rename Folder"), prompt, name);
-		if (new_name == NULL || !strcmp (name, new_name)) {
+		if (strchr(new_name, '/') != NULL) {
+			e_error_run((GtkWindow *)gtk_widget_get_toplevel((GtkWidget *)emft),
+				    "mail:no-rename-folder", name, new_name, _("Folder names cannot contain '/'"), NULL);
+			done = TRUE;
+		} else if (new_name == NULL || !strcmp (name, new_name)) {
 			/* old name == new name */
 			done = TRUE;
 		} else {
