2005-06-16 [paul] 1.9.11cvs77
authorPaul Mangan <paul@claws-mail.org>
Thu, 16 Jun 2005 10:25:25 +0000 (10:25 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 16 Jun 2005 10:25:25 +0000 (10:25 +0000)
* src/procmime.c
liberalise the mime parser
* src/gtk/about.c
add text wrapping

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/gtk/about.c
src/procmime.c

index f2d86471e422a814068725f4815c00f3a553b998..99b3a310cbc51e11066128664b9c59bba3760e1b 100644 (file)
@@ -1,3 +1,10 @@
+2005-06-16 [paul]      1.9.11cvs77
+
+       * src/procmime.c
+               liberalise the mime parser
+       * src/gtk/about.c
+               add text wrapping
+
 2005-06-16 [paul]      1.9.11cvs76
 
        * src/gtk/about.c
index adbb02a746c6e0b77f7c79cbe5ea5e68f5b22727..6678a3f6cc54f88ab7d3c4fc482657a5c0dc240d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.24.2.8 -r 1.24.2.9 Makefile.am;  cvs diff -u -r 1.65.2.32 -r 1.65.2.33 src/codeconv.c;  cvs diff -u -r 1.15.2.8 -r 1.15.2.9 src/codeconv.h;  cvs diff -u -r 1.213.2.34 -r 1.213.2.35 src/folder.c;  cvs diff -u -r 1.207.2.41 -r 1.207.2.42 src/folderview.c;  cvs diff -u -r 1.395.2.80 -r 1.395.2.81 src/summaryview.c;  cvs diff -u -r 1.68.2.7 -r 1.68.2.8 src/summaryview.h;  ) > 1.9.11cvs74.patchset
 ( cvs diff -u -r 1.382.2.131 -r 1.382.2.132 src/compose.c;  cvs diff -u -r 1.395.2.81 -r 1.395.2.82 src/summaryview.c;  cvs diff -u -r 1.8.2.6 -r 1.8.2.7 src/headerview.c;  ) > 1.9.11cvs75.patchset
 ( cvs diff -u -r 1.4.2.10 -r 1.4.2.11 src/gtk/about.c;  ) > 1.9.11cvs76.patchset
+( cvs diff -u -r 1.49.2.47 -r 1.49.2.48 src/procmime.c;  cvs diff -u -r 1.4.2.11 -r 1.4.2.12 src/gtk/about.c;  ) > 1.9.11cvs77.patchset
index 77a61d2853fb3f5342ba38339f424c78c3504d77..b7892d206734454e2d384a754699160073ca7e19 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=76
+EXTRA_VERSION=77
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 80dd85ed84e4a19658e60862d5b1273557c44e19..d6a238b5e5dabfc5b515319b2d9d544b09f90355 100644 (file)
@@ -162,6 +162,7 @@ static void about_create(void)
        label = gtk_label_new(buf);
        gtk_label_set_selectable(GTK_LABEL(label), TRUE);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
+       gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
        gtk_box_pack_start(GTK_BOX(vbox2), label, FALSE, FALSE, 0);
 
        g_snprintf(buf, sizeof(buf),
index bb84330071d2e20403d883b92655ea92c51aea6f..44b0b53d3889b72d8c41be39c67046ba5994064c 100644 (file)
@@ -1253,7 +1253,6 @@ void procmime_parse_message_rfc822(MimeInfo *mimeinfo)
                                {NULL,             NULL, FALSE}};
        guint content_start, i;
        FILE *fp;
-       gint mime_major, mime_minor;
         gchar *tmp;
 
        procmime_decode_content(mimeinfo);
@@ -1282,30 +1281,14 @@ void procmime_parse_message_rfc822(MimeInfo *mimeinfo)
         }                
        content_start = ftell(fp);
        fclose(fp);
-
-       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, 
-                                       hentry[4].body, 
-                                       mimeinfo->data.filename, content_start,
-                                       mimeinfo->length - (content_start - mimeinfo->offset));
-       } else {
-               MimeInfo *subinfo;
-
-               subinfo = procmime_mimeinfo_new();
-               subinfo->content = MIMECONTENT_FILE;
-               subinfo->encoding_type = ENC_UNKNOWN;
-               subinfo->type = MIMETYPE_TEXT;
-               subinfo->subtype = g_strdup("plain");
-               subinfo->data.filename = g_strdup(mimeinfo->data.filename);
-               subinfo->offset = content_start;
-               subinfo->length = mimeinfo->length - (content_start - mimeinfo->offset);
-
-               g_node_append(mimeinfo->node, subinfo->node);
-       }
+       
+       procmime_parse_mimepart(mimeinfo,
+                               hentry[0].body, hentry[1].body,
+                               hentry[2].body, hentry[3].body,
+                               hentry[4].body,
+                               mimeinfo->data.filename, content_start,
+                               mimeinfo->length - (content_start - mimeinfo->offset));
+       
        for (i = 0; i < (sizeof hentry / sizeof hentry[0]); i++) {
                g_free(hentry[i].body);
                hentry[i].body = NULL;