0.9.8claws30

* src/procmime.c
        better MIME-Version check

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 752b3c133eb76a85714307185352f7e34abea948..6475956131fbfcba6222bb6b9834b29a495ed845 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-01-12 [christoph] 0.9.8claws30
+
+       * src/procmime.c
+               better MIME-Version check
+
 2004-01-11 [alfons]    0.9.8claws29
 
        * src/procmsg.c

diff --git a/src/common/utils.c b/src/common/utils.c
index c94585de0dd1e76ea2bcbd51df503cdcd9dba101..6c453cb09c54347295940e00eba4f720ec51b31c 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto & The Sylpheed-Claws Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -3387,7 +3387,7 @@ int subject_get_prefix_length(const gchar *subject)
                "Res\\:",                       /* "Res:" (Brazilian Outlook) */
                "Fw\\:",                        /* "Fw:" Forward */
                "Enc\\:",                       /* "Enc:" Forward (Brazilian Outlook) */
-               "Odp\\:"                        /* "Odp:" Re (Polish Outlook) */
+               "Odp\\:",                       /* "Odp:" Re (Polish Outlook) */
                /* add more */
        };
        const int PREFIXES = sizeof prefixes / sizeof prefixes[0];

diff --git a/src/prefs_fonts.c b/src/prefs_fonts.c
index 5fcec3b0976d7c1f8485e751d226bec9d62fb715..9a47b6b188325545ce1f459743c64812f2bd4bc1 100644 (file)
--- a/src/prefs_fonts.c
+++ b/src/prefs_fonts.c
@@ -1,8 +1,6 @@
-
-
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 2003-2004 Hiroyuki Yamamoto & The Sylpheed-Claws Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/procmime.c b/src/procmime.c
index 82b9424e3446e735b1393a1bdd5d3c98c72310a1..3e18ec029c01cca690a216f17a7eac5b03ce3a9b 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto & The Sylpheed-Claws Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 
 #include "defs.h"
 
+#include <stdio.h>
 #include <glib.h>
 #include <stdio.h>
 #include <string.h>
@@ -967,6 +968,7 @@ void procmime_parse_message_rfc822(MimeInfo *mimeinfo)
                                {NULL,             NULL, FALSE}};
        guint content_start, i;
        FILE *fp;
+       gint mime_major, mime_minor, a;
 
        if(mimeinfo->encoding_type != ENC_BINARY && 
           mimeinfo->encoding_type != ENC_7BIT && 
@@ -979,7 +981,10 @@ void procmime_parse_message_rfc822(MimeInfo *mimeinfo)
        content_start = ftell(fp);
        fclose(fp);
 
-       if ((hentry[5].body != NULL) && !strcmp(hentry[5].body, "1.0")) {
+       g_strstrip(hentry[5].body);
+       if ((hentry[5].body != NULL) &&
+           (sscanf(hentry[5].body, "%d.%d", &mime_major, &mime_minor) == 2) &&
+           (mime_major == 1) && (mime_minor == 0)) {
                procmime_parse_mimepart(mimeinfo,
                                        hentry[0].body, hentry[1].body,
                                        hentry[2].body, hentry[3].body,