[evolution-patches] Patch for #71774

[Mengjie Yu <Meng-Jie Yu Sun COM>]

hi, Not Zed

Here is the patch for #71774

Will you please help me to review it?

Thanks a lot.

Yours,
Mengjie


-- 
Mengjie Yu <meng-jie yu sun com>
meng-jie yu sun com

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3546
diff -u -p -r1.3546 ChangeLog
--- ChangeLog	25 Jan 2005 10:30:17 -0000	1.3546
+++ ChangeLog	26 Jan 2005 10:22:40 -0000
@@ -1,3 +1,10 @@
+2005-01-26  Mengjie Yu  <meng-jie yu sun com>
+
+	Fixes #71774
+	* em-folder-tree.c: (emft_popup_rename_folder):
+	we should check whether the 'new_name' is a NULL pointer to avoid
+	Evolution crashes.
+
 2005-01-25  Mengjie Yu  <meng-jie yu sun com>
 
 	* em-mailer-prefs.c: (restore_labels_clicked),
Index: em-folder-tree.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-tree.c,v
retrieving revision 1.141
diff -u -p -r1.141 em-folder-tree.c
--- em-folder-tree.c	20 Jan 2005 17:49:15 -0000	1.141
+++ em-folder-tree.c	26 Jan 2005 10:22:57 -0000
@@ -2672,7 +2672,7 @@ 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 (strchr(new_name, '/') != NULL) {
+		if (new_name != NULL && 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;