[dovecot-cvs] dovecot/src/lib-imap imap-bodystructure.c,1.30,1.31

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-imap
In directory danu:/tmp/cvs-serv12850/src/lib-imap

Modified Files:
	imap-bodystructure.c 
Log Message:
Default to 7bit instead of 8bit content-encoding-type.



Index: imap-bodystructure.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-imap/imap-bodystructure.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- imap-bodystructure.c	8 Feb 2003 10:44:01 -0000	1.30
+++ imap-bodystructure.c	25 Feb 2003 20:55:52 -0000	1.31
@@ -338,7 +338,16 @@
 	/* "content type" "subtype" */
 	str_append(str, NVL(data->content_type, "\"text\""));
 	str_append_c(str, ' ');
-	str_append(str, NVL(data->content_subtype, "\"plain\""));
+	if (data->content_subtype != NULL)
+		str_append(str, data->content_subtype);
+	else {
+		if (data->content_type == NULL ||
+		    strcasecmp(data->content_type, "text") == 0)
+			str_append(str, "\"plain\"");
+		else
+			str_append(str, "\"unknown\"");
+
+	}
 
 	/* ("content type param key" "value" ...) */
 	str_append_c(str, ' ');
@@ -353,7 +362,7 @@
 	str_printfa(str, " %s %s %s %"PRIuUOFF_T,
 		    NVL(data->content_id, "NIL"),
 		    NVL(data->content_description, "NIL"),
-		    NVL(data->content_transfer_encoding, "\"8bit\""),
+		    NVL(data->content_transfer_encoding, "\"7bit\""),
 		    part->body_size.virtual_size);
 
 	if (part->flags & MESSAGE_PART_FLAG_TEXT) {