More sync with sylpheed 0.5.0pre4

diff --git a/ChangeLog b/ChangeLog
index bd79b6e..b39350b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-07-03
+
+       * src/alertpanel.c: alertpanel_create(): fixed truncated message.
+       * src/rfc2015.c: rfc2015_decrypt_message(): fixed the case problem
+         of content-type (thanks to René Rebe for the patch).
+       * src/codeconv.c: code_get_code_conv_func(): fixed the ISO-8859-1
+         detection.
+       * src/prefs_common.c: prefs_send_create(): made some more character
+         sets specifiable when not using libjconv.
+
 2001-07-02
 
        * updated gettext to 0.10.38.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index b8403db..df5a6f3 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,7 @@
+2001-07-03 [paul]
+
+       more sync with sylpheed 0.5.0pre4
+
 2001-07-02 [match]
 
        * included address book patch for VCard, JPilot, LDAP

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 074e47e..8555f72 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,13 @@
+2001-07-03
+
+       * src/alertpanel.c: alertpanel_create(): ¥á¥Ã¥»¡¼¥¸¤¬ÅÓÀÚ¤ì¤ë¤Î¤ò½¤Àµ¡£
+       * src/rfc2015.c: rfc2015_decrypt_message(): content-type ¤ÎÂ羮ʸ»ú
+         ÌäÂê¤ò½¤Àµ(¤³¤Î patch ¤Ë´Ø¤·¤Æ Rene Rebe ¤µ¤ó thanks)¡£
+       * src/codeconv.c: code_get_code_conv_func(): ISO-8859-1 ¤Î¸¡½ÐÉô¤ò
+         ½¤Àµ¡£
+       * src/prefs_common.c: prefs_send_create(): libjconv ̤»ÈÍÑ»þ¤Ë
+         ÄɲäǤ¤¤¯¤Ä¤«¤Îʸ»ú¥³¡¼¥É¥»¥Ã¥È¤ò»ØÄê¤Ç¤­¤ë¤è¤¦¤Ë¤·¤¿¡£
+
 2001-07-01
 
        * version 0.5.0pre3

diff --git a/src/alertpanel.c b/src/alertpanel.c
index 44b4f6c..d9039cf 100644 (file)
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -206,8 +206,8 @@ static void alertpanel_create(const gchar *title,
                           hbox, TRUE, TRUE, 16);
 
        /* title label */
-       //pixmapwid = create_pixmapwid(dialog, GNUstep_xpm);
-       //gtk_box_pack_start(GTK_BOX(hbox), pixmapwid, FALSE, FALSE, 16);
+       /* pixmapwid = create_pixmapwid(dialog, GNUstep_xpm); */
+       /* gtk_box_pack_start(GTK_BOX(hbox), pixmapwid, FALSE, FALSE, 16); */
        label = gtk_label_new(title);
        gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 16);
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -229,8 +229,8 @@ static void alertpanel_create(const gchar *title,
 
        /* message label */
        label = gtk_label_new(message);
-       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
        gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 32);
+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
 
        /* for button(s) */

diff --git a/src/codeconv.c b/src/codeconv.c
index 1cc342f..25dd5b7 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -414,10 +414,12 @@ CodeConvFunc conv_get_code_conv_func(const gchar *charset)
                code_conv = conv_jistodisp;
        else if (!strcasecmp(charset, CS_US_ASCII))
                code_conv = conv_ustodisp;
+       else if (!strncasecmp(charset, CS_ISO_8859_1, 10))
+               code_conv = conv_latintodisp;
 #if !HAVE_LIBJCONV
        else if (!strncasecmp(charset, "ISO-8859-", 9))
                code_conv = conv_latintodisp;
-#endif /* !HAVE_LIBJCONV */
+#endif
        else if (!strcasecmp(charset, CS_SHIFT_JIS) ||
                 !strcasecmp(charset, "SHIFT-JIS")  ||
                 !strcasecmp(charset, "SJIS")       ||
@@ -877,23 +879,21 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
                                                        break;
                                                }
                                        }
-                               } else {
-                                       if ((line_len + tlen + mbl +
-                                            (*(wtmpp + 1) ? 0 : nspc) +
-                                            (line_len > 1 ? 1 : 0))
-                                           > MAX_LINELEN) {
-                                               g_free(raw_new);
-                                               if (1 + tlen + mbl +
-                                                   (*(wtmpp + 1) ? 0 : nspc)
-                                                   >= MAX_LINELEN) {
-                                                       *tmpp = '\0';
-                                                       break;
-                                               }
-                                               *destp++ = '\n';
-                                               *destp++ = ' ';
-                                               line_len = 1;
-                                               continue;
+                               } else if ((line_len + tlen + mbl +
+                                           (*(wtmpp + 1) ? 0 : nspc) +
+                                           (line_len > 1 ? 1 : 0))
+                                          > MAX_LINELEN) {
+                                       g_free(raw_new);
+                                       if (1 + tlen + mbl +
+                                           (*(wtmpp + 1) ? 0 : nspc)
+                                           >= MAX_LINELEN) {
+                                               *tmpp = '\0';
+                                               break;
                                        }
+                                       *destp++ = '\n';
+                                       *destp++ = ' ';
+                                       line_len = 1;
+                                       continue;
                                }
 
                                tmpp += mbl;
@@ -1073,22 +1073,20 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
                                                        break;
                                                }
                                        }
-                               } else {
-                                       if ((line_len + tlen + mbl +
-                                            (*(wtmpp + 1) ? 0 : nspc) +
-                                            (line_len > 1 ? 1 : 0))
-                                           > MAX_LINELEN) {
-                                               if (1 + tlen + mbl +
-                                                   (*(wtmpp + 1) ? 0 : nspc)
-                                                   >= MAX_LINELEN) {
-                                                       *tmpp = '\0';
-                                                       break;
-                                               }
-                                               *destp++ = '\n';
-                                               *destp++ = ' ';
-                                               line_len = 1;
-                                               continue;
+                               } else if ((line_len + tlen + mbl +
+                                           (*(wtmpp + 1) ? 0 : nspc) +
+                                           (line_len > 1 ? 1 : 0))
+                                          > MAX_LINELEN) {
+                                       if (1 + tlen + mbl +
+                                           (*(wtmpp + 1) ? 0 : nspc)
+                                           >= MAX_LINELEN) {
+                                               *tmpp = '\0';
+                                               break;
                                        }
+                                       *destp++ = '\n';
+                                       *destp++ = ' ';
+                                       line_len = 1;
+                                       continue;
                                }
 
                                tmpp += mbl;

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 01dd003..7f71e47 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -985,7 +985,7 @@ static void prefs_send_create(void)
        MENUITEM_ADD(optmenu_menu, menuitem, str, charset); \
 }
 
-       SET_MENUITEM(_("Automatic"),                     CS_AUTO);
+       SET_MENUITEM(_("Automatic (Recommended)"),       CS_AUTO);
        SET_MENUITEM(_("7bit ascii (US-ASCII)"),         CS_US_ASCII);
 #if HAVE_LIBJCONV
        SET_MENUITEM(_("Unicode (UTF-8)"),               CS_UTF_8);

diff --git a/src/rfc2015.c b/src/rfc2015.c
index 0939d37..ec7c2ed 100644 (file)
--- a/src/rfc2015.c
+++ b/src/rfc2015.c
@@ -500,7 +500,7 @@ int rfc2015_is_encrypted (MimeInfo *mimeinfo)
 {
     if (!mimeinfo)
         return 0;
-    if (strcasecmp (mimeinfo->content_type, "multipart/encrypted"))
+    if (g_strcasecmp (mimeinfo->content_type, "multipart/encrypted"))
         return 0;
     /* fixme: we should schek the protocol parameter */
     return 1;
@@ -575,13 +575,13 @@ void rfc2015_decrypt_message (MsgInfo *msginfo, MimeInfo *mimeinfo, FILE *fp)
     /* check that we have the 2 parts */
     n = found = 0;
     for (partinfo = mimeinfo->children; partinfo; partinfo = partinfo->next) {
-        if (++n == 1 && !strcmp (partinfo->content_type,
-                                "application/pgp-encrypted")) {
+        if (++n == 1 && !g_strcasecmp (partinfo->content_type,
+                                      "application/pgp-encrypted")) {
             /* Fixme: check that the version is 1 */
             ver_okay = 1;
         }
-        else if (n == 2 && !strcmp (partinfo->content_type,
-                                   "application/octet-stream")) {
+        else if (n == 2 && !g_strcasecmp (partinfo->content_type,
+                                         "application/octet-stream")) {
             if (partinfo->next)
                 g_warning ("** oops: pgp_encrypted with more than 2 parts");
             break;