[Commits] [SCM] claws branch, master, updated. 3.9.2-26-g075d16a

[ticho at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  075d16af79053b6e867d982e946f1db760cdc0c3 (commit)
      from  a143f7fbce24dc216f5a32df19fb75b49e422385 (commit)


- Log -----------------------------------------------------------------
commit 075d16af79053b6e867d982e946f1db760cdc0c3
Author: Andrej Kacian <andrej at kacian.sk>
Date:   Sat Jul 6 02:32:32 2013 +0200

    Use MIME-Version instead of Mime-Version header, to conform to RFC 2045.

diff --git a/src/customheader.c b/src/customheader.c
index f569344..554fb7d 100644
--- a/src/customheader.c
+++ b/src/customheader.c
@@ -111,7 +111,7 @@ gboolean custom_header_is_allowed(const gchar *header)
 	    g_ascii_strcasecmp(header, "Message-ID")   != 0 &&
 	    g_ascii_strcasecmp(header, "In-Reply-To")  != 0 &&
 	    g_ascii_strcasecmp(header, "References")   != 0 &&
-	    g_ascii_strcasecmp(header, "Mime-Version") != 0 &&
+	    g_ascii_strcasecmp(header, "MIME-Version") != 0 &&
 	    g_ascii_strcasecmp(header, "Content-Type") != 0 &&
 	    g_ascii_strcasecmp(header, "Content-Transfer-Encoding")
 	    != 0)
diff --git a/src/plugins/vcalendar/libical/libical/sspm.c b/src/plugins/vcalendar/libical/libical/sspm.c
index bd56a53..a9ae54f 100644
--- a/src/plugins/vcalendar/libical/libical/sspm.c
+++ b/src/plugins/vcalendar/libical/libical/sspm.c
@@ -238,7 +238,7 @@ char *mime_headers[] = {
     "Content-Transfer-Encoding",
     "Content-Disposition",
     "Content-Id",
-    "Mime-Version",
+    "MIME-Version",
     0 
 };
 
@@ -1590,7 +1590,7 @@ int sspm_write_mime(struct sspm_part *parts,size_t num_parts,
     }
 
     /* write mime-version header */
-    sspm_append_string(&buf,"Mime-Version: 1.0\n");
+    sspm_append_string(&buf,"MIME-Version: 1.0\n");
 
     /* End of header */
 
diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index 5ea5252..7a06e4a 100644
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -124,7 +124,7 @@ static gchar *defaults[] =
 	"-Message-ID",
 	"-In-Reply-To",
 	"-References",
-	"-Mime-Version",
+	"-MIME-Version",
 	"-Content-Type",
 	"-Content-Transfer-Encoding",
 	"-X-UIDL",
@@ -153,7 +153,7 @@ static gchar *defaults[] =
 	"-Message-ID",
 	"-In-Reply-To",
 	"-References",
-	"-Mime-Version",
+	"-MIME-Version",
 	"-Content-Type",
 	"-Content-Transfer-Encoding",
 	"-X-UIDL",
diff --git a/src/procmime.c b/src/procmime.c
index 79dc7c3..4951f3c 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -2464,7 +2464,7 @@ static gint procmime_write_message_rfc822(MimeInfo *mimeinfo, FILE *fp)
 				break;
 			if (skip && (buf[0] == ' ' || buf[0] == '\t'))
 				continue;
-			if (g_ascii_strncasecmp(buf, "Mime-Version:", 13) == 0 ||
+			if (g_ascii_strncasecmp(buf, "MIME-Version:", 13) == 0 ||
 			    g_ascii_strncasecmp(buf, "Content-Type:", 13) == 0 ||
 			    g_ascii_strncasecmp(buf, "Content-Transfer-Encoding:", 26) == 0 ||
 			    g_ascii_strncasecmp(buf, "Content-Description:", 20) == 0 ||
@@ -2502,7 +2502,7 @@ static gint procmime_write_message_rfc822(MimeInfo *mimeinfo, FILE *fp)
 		return -1;
 
 	child = (MimeInfo *) childnode->data;
-	if (fprintf(fp, "Mime-Version: 1.0\n") < 0) {
+	if (fprintf(fp, "MIME-Version: 1.0\n") < 0) {
 		g_warning("failed to write mime version");
 		return -1;
 	}

-----------------------------------------------------------------------

Summary of changes:
 src/customheader.c                           |    2 +-
 src/plugins/vcalendar/libical/libical/sspm.c |    4 ++--
 src/prefs_display_header.c                   |    4 ++--
 src/procmime.c                               |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Claws Mail