[evolution-patches] 273752 & related. maildir/local crashes

[Not Zed <notzed novell com>]

Two parts:

The maildir one fixes a problem where some uri's have a host of "" and others have a null host.  Both should really be compared.  Without it you get a crash just trying to create a folder under maildir (maybe it depends on an old format created account ...).

The other one fixes dropping folders onto a store root.

Intended for both branches.



Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3617
diff -u -p -r1.3617 ChangeLog
--- mail/ChangeLog	8 Apr 2005 04:34:25 -0000	1.3617
+++ mail/ChangeLog	12 Apr 2005 07:27:06 -0000
@@ -1,3 +1,10 @@
+2005-04-12  Not Zed  <NotZed Ximian com>
+
+	** See bug #273752
+
+	* em-folder-tree.c (emft_drop_folder_rec): handle NULL
+	"parent_name" - dropping to store node.
+
 2005-04-08  Not Zed  <NotZed Ximian com>
 
 	* em-composer-utils.c (em_utils_ask_receipt): removed.
Index: mail/em-folder-tree.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-tree.c,v
retrieving revision 1.146
diff -u -p -r1.146 em-folder-tree.c
--- mail/em-folder-tree.c	1 Apr 2005 00:43:27 -0000	1.146
+++ mail/em-folder-tree.c	12 Apr 2005 07:27:07 -0000
@@ -833,7 +833,7 @@ emft_drop_folder_rec (CamelStore *store,
 			break;
 		
 		/* handles dropping to the root properly */
-		if (parent_name[0])
+		if (parent_name && parent_name[0])
 			new_name = g_strdup_printf ("%s/%s", parent_name, src->name);
 		else
 			new_name = g_strdup (src->name);
 

Index: camel/providers/local/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/local/ChangeLog,v
retrieving revision 1.6
diff -u -p -r1.6 ChangeLog
--- camel/providers/local/ChangeLog	21 Mar 2005 03:37:18 -0000	1.6
+++ camel/providers/local/ChangeLog	12 Apr 2005 07:24:21 -0000
@@ -1,3 +1,8 @@
+2005-04-12  Not Zed  <NotZed Ximian com>
+
+	* camel-local-provider.c (check_equal): make "" equal NULL for
+	comparative purposes.
+
 2005-03-18  Not Zed  <NotZed Ximian com>
 
 	* camel-mbox-summary.c (mbox_summary_sync_quick): use a different
Index: camel/providers/local/camel-local-provider.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/local/camel-local-provider.c,v
retrieving revision 1.30
diff -u -p -r1.30 camel-local-provider.c
--- camel/providers/local/camel-local-provider.c	20 Sep 2004 05:59:54 -0000	1.30
+++ camel/providers/local/camel-local-provider.c	12 Apr 2005 07:24:22 -0000
@@ -166,8 +166,8 @@ local_url_hash (const void *v)
 static int
 check_equal (char *s1, char *s2)
 {
-	if (s1 == NULL) {
-		if (s2 == NULL)
+	if (s1 == NULL || *s1 == 0) {
+		if (s2 == NULL || *s2 == 0)
 			return TRUE;
 		else
 			return FALSE;