? camel/c.diff
? camel/camel-mime-tables.c
? camel/tests/folder/test11
? camel/tests/message/test4
Index: camel/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/ChangeLog,v
retrieving revision 1.2413
diff -u -p -r1.2413 ChangeLog
--- camel/ChangeLog	31 Jan 2005 04:15:19 -0000	1.2413
+++ camel/ChangeLog	31 Jan 2005 05:41:29 -0000
@@ -1,5 +1,13 @@
 2005-01-31  Not Zed  <NotZed@Ximian.com>
 
+	** See bug #68741.
+
+	* camel-vtrash-folder.h: move Junk and Trash into the ".#evolution"
+	'namespace'.
+
+	* camel-store.c (add_special_info): only compare the full name for
+	the special folder.
+
 	** See bug #38671.
 
 	* camel-filter-search.c (check_header): check all instances of
Index: camel/camel-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-store.c,v
retrieving revision 1.156
diff -u -p -r1.156 camel-store.c
--- camel/camel-store.c	17 Jan 2005 09:01:53 -0000	1.156
+++ camel/camel-store.c	31 Jan 2005 05:41:29 -0000
@@ -673,7 +673,7 @@ add_special_info (CamelStore *store, Cam
 	
 	parent = NULL;
 	for (fi = info; fi; fi = fi->next) {
-		if (!strcmp (fi->name, name))
+		if (!strcmp (fi->full_name, name))
 			break;
 		parent = fi;
 	}
Index: camel/camel-vtrash-folder.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-vtrash-folder.h,v
retrieving revision 1.7
diff -u -p -r1.7 camel-vtrash-folder.h
--- camel/camel-vtrash-folder.h	27 Feb 2004 06:08:04 -0000	1.7
+++ camel/camel-vtrash-folder.h	31 Jan 2005 05:41:29 -0000
@@ -39,8 +39,8 @@ extern "C" {
 typedef struct _CamelVTrashFolder      CamelVTrashFolder;
 typedef struct _CamelVTrashFolderClass CamelVTrashFolderClass;
 
-#define CAMEL_VTRASH_NAME "Trash"
-#define CAMEL_VJUNK_NAME "Junk"
+#define CAMEL_VTRASH_NAME ".#evolution/Trash"
+#define CAMEL_VJUNK_NAME ".#evolution/Junk"
 
 enum _camel_vtrash_folder_t {
 	CAMEL_VTRASH_FOLDER_TRASH,
 
