From: pdmef Date: Thu, 11 Aug 2005 09:36:28 +0000 (+0000) Subject: Rocco Rutte: X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=be393b838c5e0b8dfe9bedcc7a4a63f05caae7c4 Rocco Rutte: - merge in latest mutt changes - add missing prototypes to hcache.h git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@384 e385b8ad-14ed-0310-8656-cc95a2468c6d --- diff --git a/ChangeLog.mutt b/ChangeLog.mutt index fc3a9d5..e0e8807 100644 --- a/ChangeLog.mutt +++ b/ChangeLog.mutt @@ -1,4 +1,66 @@ -2005-08-08 03:30:59 Brendan Cully (brendan) +2005-08-09 20:13:03 Brendan Cully (brendan) + + * doc/Makefile.in, doc/manual.sgml.tail: Replace raw latin1 + characters with entities, and enable latin output for + manual.txt. I'm not sure this is ideal for non-latin (eg + utf8) environments, but hopefully docbook will resolve this + anyway. Closes: #2029. + +2005-08-09 19:59:46 Brendan Cully (brendan) + + * doc/manual.sgml.head: Replace free ~ with ˜. Closes: + #2030. + + * pgp.c: Move pgp failure check inside the if (invoke pgp) + block. Really Closes: 2032. + + * pgp.c: Don't ftell pgp output file if there isn't one. Closes: + #2032. + +2005-08-09 16:24:15 TAKAHASHI Tamotsu (brendan) + + * crypt-gpgme.c: Improve translatability of crypt-gpgme. Closes: + #2020. + +2005-08-09 16:10:40 Mads Martin Joergensen (brendan) + + * copy.c: Remove an unneeded cast, which introduces + type-punning. Modified to use FREE instead of safe_free, since + that seems to be the convention. I personally don't see the + point. + +2005-08-08 18:59:43 Brendan Cully (brendan) + + * mutt_socket.c: Pause for a moment when a hostname fails to + resolve. Closes #1942. There are a number of cases where mutt + cascades error messages. It might be nice if there were an error + stack so that low level functions could push_error instead of + displaying it right away, and the higher level ones could eg + mutt_message(_("Failed to write FCC: %s"), pop_error ())... + + * main.c: Document -d option in mutt -h output. Closes #2027. + + * init.h: Remove undefined reference to unmailboxes + command. Closes #2028. + +2005-08-08 06:44:01 Brendan Cully (brendan) + + * imap/imap.c: Fix edge case where we might have to wait two + timeouts to check for IMAP mail. + + * imap/command.c, imap/imap.c, init.h: Fix bug just introduced in + lsub parsing that could cause mutt to loop indefinitely. Don't + recheck subscriptions at every mailbox change, just the initial + connection. + + * imap/imap.c: If imap_check_subscribed is set, mailbox or + unmailbox folders in response to subscribe/unsubscribe commands in + the browser. + + * imap/browse.c, imap/command.c, imap/imap.c, init.h, mutt.h: New + option: $imap_check_subscribed. If set, mutt will fetch the set of + subscribed mailboxes from the server and add them to the buffy + list. * browser.c: Avoid a segfault attempting to browse an invalid IMAP URL. @@ -114,7 +176,7 @@ * account.c: Fix password prompt for POP (more authentication ID fallout). - * doc/manual.sgml.head: Document key. + * doc/manual.sgml.head: Document key. * pgp.c: Automatically forget PGP passphrase on sign or decrypt error. (closes #1025). Display "successfully decrypted" message diff --git a/UPGRADING b/UPGRADING index 0e2c23f..ffcbba2 100644 --- a/UPGRADING +++ b/UPGRADING @@ -10,6 +10,10 @@ This document is not the place for verbose documentation; it only offers the necessary keywords to look them up in the manual, ChangeLog or other sources of information. +2005-08-11: + + The $imap_check_subscribed option has been added. + 2005-08-08: The $imap_force_ssl option has been replaced with the more generic diff --git a/configure.in b/configure.in index 08240d7..b8b9a4a 100644 --- a/configure.in +++ b/configure.in @@ -1142,13 +1142,13 @@ case "`uname -s`" in AC_MSG_RESULT(FreeBSD) ;; SunOS) - SGML2TXT_CMD="sgml2txt manual || true" - SGML2PS_CMD="sgml2latex -p manual || true" - SGML2HTML_CMD="sgml2html manual || true" + SGML2TXT_CMD="sgml2txt -l manual || true" + SGML2PS_CMD="sgml2latex -l -p manual || true" + SGML2HTML_CMD="sgml2html -l manual || true" AC_MSG_RESULT(Solaris) ;; *) - SGML2TXT_CMD="if linuxdoc -B txt --pass='-P -c' manual ; then uniq < manual.txt | expand > _manual.txt ; rm manual.txt ; col -b < _manual.txt > manual.txt ; rm -rf _manual.txt ; fi || true" + SGML2TXT_CMD="if linuxdoc -B txt -c latin --pass='-P -c' manual ; then uniq < manual.txt | expand > _manual.txt ; rm manual.txt ; col -b < _manual.txt > manual.txt ; rm -rf _manual.txt ; fi || true" SGML2PS_CMD="sgml2latex --output=ps manual || true" SGML2HTML_CMD="sgml2html manual || true" AC_MSG_RESULT(Linux (default)) diff --git a/crypt-gpgme.c b/crypt-gpgme.c index ed84713..7f6ce25 100644 --- a/crypt-gpgme.c +++ b/crypt-gpgme.c @@ -2753,7 +2753,8 @@ static void print_key_info (gpgme_key_t key, FILE * fp) continue; s = uid->uid; - fprintf (fp, "%s ......: ", idx ? _(" aka") : _("Name")); + fputs (idx ? _(" aka ......: ") :_("Name ......: "), fp); + if (uid->invalid) { fputs (_("[Invalid]"), fp); putc (' ', fp); @@ -2774,7 +2775,7 @@ static void print_key_info (gpgme_key_t key, FILE * fp) #else strftime (shortbuf, sizeof shortbuf, "%c", tm); #endif - fprintf (fp, "Valid From : %s\n", shortbuf); + fprintf (fp, _("Valid From : %s\n"), shortbuf); } if (key->subkeys && (key->subkeys->expires > 0)) { @@ -2786,7 +2787,7 @@ static void print_key_info (gpgme_key_t key, FILE * fp) #else strftime (shortbuf, sizeof shortbuf, "%c", tm); #endif - fprintf (fp, "Valid To ..: %s\n", shortbuf); + fprintf (fp, _("Valid To ..: %s\n"), shortbuf); } if (key->subkeys) @@ -2799,22 +2800,22 @@ static void print_key_info (gpgme_key_t key, FILE * fp) if (key->subkeys) aval = key->subkeys->length; - fprintf (fp, "Key Type ..: %s, %lu bit %s\n", s2, aval, s); + fprintf (fp, _("Key Type ..: %s, %lu bit %s\n"), s2, aval, s); - fprintf (fp, "Key Usage .: "); + fprintf (fp, _("Key Usage .: ")); delim = ""; if (key_check_cap (key, KEY_CAP_CAN_ENCRYPT)) { fprintf (fp, "%s%s", delim, _("encryption")); - delim = ", "; + delim = _(", "); } if (key_check_cap (key, KEY_CAP_CAN_SIGN)) { fprintf (fp, "%s%s", delim, _("signing")); - delim = ", "; + delim = _(", "); } if (key_check_cap (key, KEY_CAP_CAN_CERTIFY)) { fprintf (fp, "%s%s", delim, _("certification")); - delim = ", "; + delim = _(", "); } putc ('\n', fp); @@ -2847,13 +2848,13 @@ static void print_key_info (gpgme_key_t key, FILE * fp) if (key->issuer_serial) { s = key->issuer_serial; if (s) - fprintf (fp, "Serial-No .: 0x%s\n", s); + fprintf (fp, _("Serial-No .: 0x%s\n"), s); } if (key->issuer_name) { s = key->issuer_name; if (s) { - fprintf (fp, "Issued By .: "); + fprintf (fp, _("Issued By .: ")); parse_and_print_user_id (fp, s); putc ('\n', fp); } @@ -2869,7 +2870,7 @@ static void print_key_info (gpgme_key_t key, FILE * fp) putc ('\n', fp); if (str_len (s) == 16) s += 8; /* display only the short keyID */ - fprintf (fp, "Subkey ....: 0x%s", s); + fprintf (fp, _("Subkey ....: 0x%s"), s); if (subkey->revoked) { putc (' ', fp); fputs (_("[Revoked]"), fp); @@ -2897,7 +2898,7 @@ static void print_key_info (gpgme_key_t key, FILE * fp) #else strftime (shortbuf, sizeof shortbuf, "%c", tm); #endif - fprintf (fp, "Valid From : %s\n", shortbuf); + fprintf (fp, _("Valid From : %s\n"), shortbuf); } if (subkey->expires > 0) { @@ -2909,7 +2910,7 @@ static void print_key_info (gpgme_key_t key, FILE * fp) #else strftime (shortbuf, sizeof shortbuf, "%c", tm); #endif - fprintf (fp, "Valid To ..: %s\n", shortbuf); + fprintf (fp, _("Valid To ..: %s\n"), shortbuf); } if (subkey) @@ -2922,22 +2923,22 @@ static void print_key_info (gpgme_key_t key, FILE * fp) else aval = 0; - fprintf (fp, "Key Type ..: %s, %lu bit %s\n", "PGP", aval, s); + fprintf (fp, _("Key Type ..: %s, %lu bit %s\n"), "PGP", aval, s); - fprintf (fp, "Key Usage .: "); + fprintf (fp, _("Key Usage .: ")); delim = ""; if (subkey->can_encrypt) { fprintf (fp, "%s%s", delim, _("encryption")); - delim = ", "; + delim = _(", "); } if (subkey->can_sign) { fprintf (fp, "%s%s", delim, _("signing")); - delim = ", "; + delim = _(", "); } if (subkey->can_certify) { fprintf (fp, "%s%s", delim, _("certification")); - delim = ", "; + delim = _(", "); } putc ('\n', fp); } diff --git a/doc/manual.sgml.head b/doc/manual.sgml.head index e49e064..7bbf027 100644 --- a/doc/manual.sgml.head +++ b/doc/manual.sgml.head @@ -1,4 +1,5 @@ - + @@ -3221,7 +3222,7 @@ individually). The variable's ``%y'' and ``%Y'' escapes can be used to expand ``X-Label:'' fields in the index, and Mutt-ng's pattern-matcher can match regular expressions to -``X-Label:'' fields with the ``~y'' selector. ``X-Label:'' is not a +``X-Label:'' fields with the ``˜y'' selector. ``X-Label:'' is not a standard message header field, but it can easily be inserted by procmail and other mail filtering agents. diff --git a/doc/manual.sgml.tail b/doc/manual.sgml.tail index ba7e05a..c9dd0bf 100644 --- a/doc/manual.sgml.tail +++ b/doc/manual.sgml.tail @@ -1,4 +1,5 @@ - + Functions