allow spaces around equals between name and value of MIME parameters.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1469 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 16 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 891f3a73..5b1fa88a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-01-11
 
+	* libsylph/procmime.c: procmime_parse_mime_parameter(): allow spaces
+	  around equals between name and value of MIME parameters.
+
+2007-01-11
+
 	* libsylph/prefs_common.[ch]
 	  src/trayicon.c
 	  src/prefs_common_dialog.c: added the option to toggle window on
diff --git a/ChangeLog.ja b/ChangeLog.ja
index cae2d9bd..d2e3d3f2 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2007-01-11
 
+	* libsylph/procmime.c: procmime_parse_mime_parameter(): MIME
+	  パラメータの名前と値の間の等号の周囲の空白を許容するようにした。
+
+2007-01-11
+
 	* libsylph/prefs_common.[ch]
 	  src/trayicon.c
 	  src/prefs_common_dialog.c: トレイアイコンのクリックでウィンドウを
diff --git a/libsylph/procmime.c b/libsylph/procmime.c
index 775c30a8..243a0474 100644
--- a/libsylph/procmime.c
+++ b/libsylph/procmime.c
@@ -402,7 +402,7 @@ static gchar *procmime_find_parameter_delimiter(const gchar *param,
 	while (*p) {
 		if (*p == '=')
 			break;
-		else if (*p == ';' || g_ascii_isspace(*p)) {
+		else if (*p == ';' || *p == '\r' || *p == '\n') {
 			delim = p;
 			break;
 		}
@@ -415,6 +415,8 @@ static gchar *procmime_find_parameter_delimiter(const gchar *param,
 	*eq = p;
 
 	++p;
+	while (g_ascii_isspace(*p))
+		++p;
 	if (*p == '"') {
 		quoted = TRUE;
 		++p;
@@ -424,7 +426,7 @@ static gchar *procmime_find_parameter_delimiter(const gchar *param,
 		if (quoted == TRUE) {
 			if (*p == '"')
 				quoted = FALSE;
-		} else if (*p == ';' || g_ascii_isspace(*p)) {
+		} else if (*p == ';' || *p == '\r' || *p == '\n') {
 			delim = p;
 			break;
 		}
@@ -498,6 +500,7 @@ static MimeParams *procmime_parse_mime_parameter(const gchar *str)
 			param = g_strdup(p);
 
 		name = g_strndup(p, eq - p);
+		g_strchomp(name);
 		if (*name != '*' && (ast = strchr(name, '*'))) {
 			const gchar *next = ast + 1;
 
@@ -526,6 +529,7 @@ static MimeParams *procmime_parse_mime_parameter(const gchar *str)
 		}
 
 		value = g_strdup(param + (eq - p) + 1);
+		g_strstrip(value);
 		if (*value == '"')
 			extract_quote(value, '"');