42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
|
Index: camel/providers/imap/camel-imap-folder.c
|
||
|
===================================================================
|
||
|
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap/camel-imap-folder.c,v
|
||
|
retrieving revision 1.359
|
||
|
retrieving revision 1.360
|
||
|
diff -u -r1.359 -r1.360
|
||
|
--- camel/providers/imap/camel-imap-folder.c 2006/04/21 09:15:50 1.359
|
||
|
+++ camel/providers/imap/camel-imap-folder.c 2006/05/10 08:49:18 1.360
|
||
|
@@ -2322,7 +2322,7 @@
|
||
|
}
|
||
|
|
||
|
|
||
|
-#define CAMEL_MESSAGE_INFO_HEADERS "DATE FROM TO CC SUBJECT REFERENCES IN-REPLY-TO MESSAGE-ID MIME-VERSION CONTENT-TYPE"
|
||
|
+#define CAMEL_MESSAGE_INFO_HEADERS "DATE FROM TO CC SUBJECT REFERENCES IN-REPLY-TO MESSAGE-ID MIME-VERSION CONTENT-TYPE "
|
||
|
|
||
|
/* FIXME: this needs to be kept in sync with camel-mime-utils.c's list
|
||
|
of mailing-list headers and so might be best if this were
|
||
|
Index: camel/providers/groupwise/camel-groupwise-folder.c
|
||
|
===================================================================
|
||
|
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-folder.c,v
|
||
|
retrieving revision 1.133
|
||
|
diff -u -p -r1.133 camel-groupwise-folder.c
|
||
|
--- camel/providers/groupwise/camel-groupwise-folder.c 17 May 2006 08:48:19 -0000 1.133
|
||
|
+++ camel/providers/groupwise/camel-groupwise-folder.c 17 May 2006 08:52:17 -0000
|
||
|
@@ -959,6 +959,7 @@ groupwise_refresh_folder(CamelFolder *fo
|
||
|
goto end1;
|
||
|
|
||
|
if (!strcmp (folder->full_name, "Trash")) {
|
||
|
+#if 0
|
||
|
status = e_gw_connection_get_items (cnc, container_id, "peek recipient distribution created delivered attachments subject status size", NULL, &list);
|
||
|
if (status != E_GW_CONNECTION_STATUS_OK) {
|
||
|
if (status ==E_GW_CONNECTION_STATUS_OTHER) {
|
||
|
@@ -978,6 +979,8 @@ groupwise_refresh_folder(CamelFolder *fo
|
||
|
list = NULL;
|
||
|
}
|
||
|
goto end1;
|
||
|
+#endif
|
||
|
+ is_proxy = TRUE;
|
||
|
}
|
||
|
|
||
|
time_string = g_strdup (((CamelGroupwiseSummary *) folder->summary)->time_string);
|