aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-tools.c4
-rw-r--r--mail/mail-tools.h3
3 files changed, 12 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 3536b72fdf..8a5fbc54eb 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-18 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-tools.c (mail_tool_remove_xevolution_headers): Oops, forgot
+ about X-Evolution-Format.
+ (mail_tool_restore_xevolution_headers): Same.
+
2001-09-18 Dan Winship <danw@ximian.com>
* folder-browser.c (folder_browser_set_uri): Merged into
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 1cbf3163a2..1c151b9d5e 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -238,6 +238,7 @@ mail_tool_remove_xevolution_headers (CamelMimeMessage *message)
xev->transport = g_strdup (camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Transport"));
xev->account = g_strdup (camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Account"));
xev->fcc = g_strdup (camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Fcc"));
+ xev->format = g_strdup (camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Format"));
/* rip off the X-Evolution* headers */
camel_medium_remove_header (CAMEL_MEDIUM (message), "X-Evolution");
@@ -245,6 +246,7 @@ mail_tool_remove_xevolution_headers (CamelMimeMessage *message)
camel_medium_remove_header (CAMEL_MEDIUM (message), "X-Evolution-Transport");
camel_medium_remove_header (CAMEL_MEDIUM (message), "X-Evolution-Account");
camel_medium_remove_header (CAMEL_MEDIUM (message), "X-Evolution-Fcc");
+ camel_medium_remove_header (CAMEL_MEDIUM (message), "X-Evolution-Format");
return xev;
}
@@ -262,6 +264,8 @@ mail_tool_restore_xevolution_headers (CamelMimeMessage *message, XEvolution *xev
camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Account", xev->account);
if (xev->fcc)
camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Fcc", xev->fcc);
+ if (xev->format)
+ camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Format", xev->format);
}
void
diff --git a/mail/mail-tools.h b/mail/mail-tools.h
index bcae822001..b44086352b 100644
--- a/mail/mail-tools.h
+++ b/mail/mail-tools.h
@@ -28,12 +28,13 @@
#include <camel/camel.h>
#include <camel/camel-filter-driver.h> /*eek*/
-typedef struct xevolution {
+typedef struct _xevolution {
char *flags;
char *source;
char *transport;
char *account;
char *fcc;
+ char *format;
} XEvolution;
/* Get a CamelFolder from a root url and a foldername (uses the global session)*/