+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.
+2001-07-03 [paul]
+
+ more sync with sylpheed 0.5.0pre4
+
2001-07-02 [match]
* included address book patch for VCard, JPilot, LDAP
+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
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);
/* 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) */
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") ||
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;
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;
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);
{
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;
/* 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;