X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=crypt.cpkg;h=f482cdb92f2d52039902499213463bd3046bdbb7;hp=819adae4b8a4a8ff29257200f96cb42132ec7b54;hb=bc89c69d31e242e2ff4589438f4eb5869d5899f9;hpb=91acd32003fb8eb9b3b05b35c1aa32a6c07aad43

diff --git a/crypt.cpkg b/crypt.cpkg
index 819adae..f482cdb 100644
--- a/crypt.cpkg
+++ b/crypt.cpkg
@@ -197,7 +197,7 @@ static void convert_to_7bit (BODY * a)
         if (a->type == TYPEMULTIPART) {
             a->encoding = ENC7BIT;
             convert_to_7bit(a->parts);
-        } else if (a->type == TYPEMESSAGE && tok == MIME_DELIVERY_STATUS) {
+        } else if (a->type == TYPEMESSAGE && tok != MIME_DELIVERY_STATUS) {
             if (a->encoding != ENC7BIT)
                 mutt_message_to_7bit(a, NULL);
         } else if (a->encoding == ENC8BIT) {
@@ -690,7 +690,7 @@ static void print_time(time_t t, STATE *s)
     char p[STRING];
 
     setlocale(LC_TIME, "");
-#ifdef HAVE_LANGINFO_D_T_FMT
+#ifdef D_T_FMT
     strftime(p, sizeof(p), nl_langinfo(D_T_FMT), localtime(&t));
 #else
     strftime(p, sizeof(p), "%c", localtime(&t));
@@ -2680,7 +2680,7 @@ static void print_key_info (gpgme_key_t key, FILE * fp)
     tt = key->subkeys->timestamp;
 
     tm = localtime (&tt);
-#ifdef HAVE_LANGINFO_D_T_FMT
+#ifdef D_T_FMT
     strftime (shortbuf, sizeof shortbuf, nl_langinfo (D_T_FMT), tm);
 #else
     strftime (shortbuf, sizeof shortbuf, "%c", tm);
@@ -2692,7 +2692,7 @@ static void print_key_info (gpgme_key_t key, FILE * fp)
     tt = key->subkeys->expires;
 
     tm = localtime (&tt);
-#ifdef HAVE_LANGINFO_D_T_FMT
+#ifdef D_T_FMT
     strftime (shortbuf, sizeof shortbuf, nl_langinfo (D_T_FMT), tm);
 #else
     strftime (shortbuf, sizeof shortbuf, "%c", tm);
@@ -2803,7 +2803,7 @@ static void print_key_info (gpgme_key_t key, FILE * fp)
         tt = subkey->timestamp;
 
         tm = localtime (&tt);
-#ifdef HAVE_LANGINFO_D_T_FMT
+#ifdef D_T_FMT
         strftime (shortbuf, sizeof shortbuf, nl_langinfo (D_T_FMT), tm);
 #else
         strftime (shortbuf, sizeof shortbuf, "%c", tm);
@@ -2815,7 +2815,7 @@ static void print_key_info (gpgme_key_t key, FILE * fp)
         tt = subkey->expires;
 
         tm = localtime (&tt);
-#ifdef HAVE_LANGINFO_D_T_FMT
+#ifdef D_T_FMT
         strftime (shortbuf, sizeof shortbuf, nl_langinfo (D_T_FMT), tm);
 #else
         strftime (shortbuf, sizeof shortbuf, "%c", tm);