sycn with 0.8.8cvs11

[claws.git] / src / procmime.c

diff --git a/src/procmime.c b/src/procmime.c
index a0d1f8280acda6b4bd490be30c459368f99d9680..97585cc3c1128c678225241330a30a78f8be88bf 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto

  *
  * 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
  *
  * 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


@@ -33,6 +33,7 @@
 #include "procmime.h"
 #include "procheader.h"
 #include "base64.h"
 #include "procmime.h"
 #include "procheader.h"
 #include "base64.h"

+#include "quoted-printable.h"

 #include "uuencode.h"
 #include "unmime.h"
 #include "html.h"
 #include "uuencode.h"
 #include "unmime.h"
 #include "html.h"


@@ -45,7 +46,7 @@
 #  include "rfc2015.h"
 #endif
 
 #  include "rfc2015.h"
 #endif
 

-#include "prefs.h"
+#include "prefs_gtk.h"

 
 static GHashTable *procmime_get_mime_type_table        (void);
 
 
 static GHashTable *procmime_get_mime_type_table        (void);
 


@@ -60,28 +61,6 @@ MimeInfo *procmime_mimeinfo_new(void)
        return mimeinfo;
 }
 
        return mimeinfo;
 }
 

-void procmime_mimeinfo_free(MimeInfo *mimeinfo)
-{
-       if (!mimeinfo) return;
-
-       g_free(mimeinfo->encoding);
-       g_free(mimeinfo->content_type);
-       g_free(mimeinfo->charset);
-       g_free(mimeinfo->name);
-       g_free(mimeinfo->boundary);
-       g_free(mimeinfo->content_disposition);
-       g_free(mimeinfo->filename);
-#if USE_GPGME
-       g_free(mimeinfo->plaintextfile);
-       g_free(mimeinfo->sigstatus);
-       g_free(mimeinfo->sigstatus_full);
-#endif
-
-       procmime_mimeinfo_free(mimeinfo->sub);
-
-       g_free(mimeinfo);
-}
-

 void procmime_mimeinfo_free_all(MimeInfo *mimeinfo)
 {
        while (mimeinfo != NULL) {
 void procmime_mimeinfo_free_all(MimeInfo *mimeinfo)
 {
        while (mimeinfo != NULL) {


@@ -271,7 +250,7 @@ void procmime_scan_multipart_message(MimeInfo *mimeinfo, FILE *fp)
                        if (!sub) break;
 
                        sub->level = partinfo->level + 1;
                        if (!sub) break;
 
                        sub->level = partinfo->level + 1;

-                       sub->parent = partinfo->parent;
+                       sub->parent = partinfo;

                        sub->main = partinfo;
 
                        if (sub->level < 8) {
                        sub->main = partinfo;
 
                        if (sub->level < 8) {


@@ -403,7 +382,10 @@ void procmime_scan_content_type(MimeInfo *mimeinfo, const gchar *content_type)
                                Xalloca(tmp, len, return);
                                conv_unmime_header(tmp, len, value, NULL);
                                g_free(mimeinfo->name);
                                Xalloca(tmp, len, return);
                                conv_unmime_header(tmp, len, value, NULL);
                                g_free(mimeinfo->name);

-                               mimeinfo->name = g_strdup(tmp);
+                               /*pgp signatures should NOT have a name */
+                               if (mimeinfo->content_type 
+                               &&  strcasecmp(mimeinfo->content_type, "application/pgp-signature"))
+                                       mimeinfo->name = g_strdup(tmp);

                        } else if (!strcasecmp(attr, "boundary"))
                                mimeinfo->boundary = g_strdup(value);
                }
                        } else if (!strcasecmp(attr, "boundary"))
                                mimeinfo->boundary = g_strdup(value);
                }


@@ -467,7 +449,10 @@ void procmime_scan_content_disposition(MimeInfo *mimeinfo,
                                Xalloca(tmp, len, return);
                                conv_unmime_header(tmp, len, value, NULL);
                                g_free(mimeinfo->filename);
                                Xalloca(tmp, len, return);
                                conv_unmime_header(tmp, len, value, NULL);
                                g_free(mimeinfo->filename);

-                               mimeinfo->filename = g_strdup(tmp);
+                               /*pgp signatures should NOT have a name */
+                               if (mimeinfo->content_type 
+                               &&  strcasecmp(mimeinfo->content_type, "application/pgp-signature"))
+                                       mimeinfo->filename = g_strdup(tmp);

                                break;
                        }
                }
                                break;
                        }
                }


@@ -498,7 +483,11 @@ void procmime_scan_content_description(MimeInfo *mimeinfo,
        Xalloca(tmp, blen, return);
        conv_unmime_header(tmp, blen, buf, NULL);
        g_free(mimeinfo->name);
        Xalloca(tmp, blen, return);
        conv_unmime_header(tmp, blen, buf, NULL);
        g_free(mimeinfo->name);

-       mimeinfo->name = g_strdup(tmp);
+       mimeinfo->name = NULL;
+       /*pgp signatures should NOT have a name */
+       if (mimeinfo->content_type 
+       &&  strcasecmp(mimeinfo->content_type, "application/pgp-signature"))
+               mimeinfo->name = g_strdup(tmp);

 }
 
 void procmime_scan_subject(MimeInfo *mimeinfo,
 }
 
 void procmime_scan_subject(MimeInfo *mimeinfo,


@@ -623,7 +612,7 @@ FILE *procmime_decode_content(FILE *outfp, FILE *infp, MimeInfo *mimeinfo)
                       (!boundary ||
                        !IS_BOUNDARY(buf, boundary, boundary_len))) {
                        gint len;
                       (!boundary ||
                        !IS_BOUNDARY(buf, boundary, boundary_len))) {
                        gint len;

-                       len = unmime_quoted_printable_line(buf);
+                       len = qp_decode_line(buf);

                        fwrite(buf, len, 1, outfp);
                }
        } else if (mimeinfo->encoding_type == ENC_BASE64) {
                        fwrite(buf, len, 1, outfp);
                }
        } else if (mimeinfo->encoding_type == ENC_BASE64) {


@@ -790,7 +779,7 @@ void renderer_write_config(void)
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, RENDERER_RC, NULL);
        
        if ((pfile = prefs_write_open(rcpath)) == NULL) {
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, RENDERER_RC, NULL);
        
        if ((pfile = prefs_write_open(rcpath)) == NULL) {

-               g_warning(_("failed to write configuration to file\n"));
+               g_warning("failed to write configuration to file\n");

                g_free(rcpath);
                return;
        }
                g_free(rcpath);
                return;
        }


@@ -804,8 +793,8 @@ void renderer_write_config(void)
                        renderer->renderer);
        }
 
                        renderer->renderer);
        }
 

-       if (prefs_write_close(pfile) < 0) {
-               g_warning(_("failed to write configuration to file\n"));
+       if (prefs_file_close(pfile) < 0) {
+               g_warning("failed to write configuration to file\n");

                return;
        }
 }
                return;
        }
 }


@@ -915,7 +904,7 @@ FILE *procmime_get_text_content(MimeInfo *mimeinfo, FILE *infp)
        }
 
        if (conv_fail)
        }
 
        if (conv_fail)

-               g_warning(_("procmime_get_text_content(): Code conversion failed.\n"));
+               g_warning("procmime_get_text_content(): Code conversion failed.\n");

 
        fclose(tmpfp);
        rewind(outfp);
 
        fclose(tmpfp);
        rewind(outfp);


@@ -1249,10 +1238,14 @@ EncodingType procmime_get_encoding_for_charset(const gchar *charset)
        else if (!strncasecmp(charset, "ISO-2022-", 9) ||
                 !strcasecmp(charset, "US-ASCII"))
                return ENC_7BIT;
        else if (!strncasecmp(charset, "ISO-2022-", 9) ||
                 !strcasecmp(charset, "US-ASCII"))
                return ENC_7BIT;

+       else if (!strcasecmp(charset, "ISO-8859-5") ||
+                !strncasecmp(charset, "KOI8-", 5) ||
+                !strcasecmp(charset, "Windows-1251"))
+               return ENC_8BIT;
+       else if (!strncasecmp(charset, "ISO-8859-", 9))
+               return ENC_QUOTED_PRINTABLE;

        else
                return ENC_8BIT;
        else
                return ENC_8BIT;

-               /* return ENC_BASE64; */
-               /* return ENC_QUOTED_PRINTABLE; */

 }
 
 EncodingType procmime_get_encoding_for_file(const gchar *file)
 }
 
 EncodingType procmime_get_encoding_for_file(const gchar *file)


@@ -1282,15 +1275,29 @@ EncodingType procmime_get_encoding_for_file(const gchar *file)
        return ENC_7BIT;
 }
 
        return ENC_7BIT;
 }
 

-const gchar *procmime_get_encoding_str(EncodingType encoding)
+struct EncodingTable 

 {
 {

-       static const gchar *encoding_str[] = {
-               "7bit", "8bit", "quoted-printable", "base64", "x-uuencode",
-               NULL
-       };
+       gchar *str;
+       EncodingType enc_type;
+};

 
 

-       if (encoding >= ENC_7BIT && encoding <= ENC_UNKNOWN)
-               return encoding_str[encoding];
-       else
-               return NULL;
+struct EncodingTable encoding_table[] = {
+       {"7bit", ENC_7BIT},
+       {"8bit", ENC_8BIT},
+       {"binary", ENC_BINARY},
+       {"quoted-printable", ENC_QUOTED_PRINTABLE},
+       {"base64", ENC_BASE64},
+       {"x-uuencode", ENC_UNKNOWN},
+       {NULL, ENC_UNKNOWN},
+};
+
+const gchar *procmime_get_encoding_str(EncodingType encoding)
+{
+       struct EncodingTable *enc_table;
+       
+       for (enc_table = encoding_table; enc_table->str != NULL; enc_table++) {
+               if (enc_table->enc_type == encoding)
+                       return enc_table->str;
+       }
+       return NULL;

 }
 }