Commit f80e6aed authored by Brendan Cully's avatar Brendan Cully

Merge with Rocco

parents 0140d329 98c798e8
2008-05-19 10:59 +0200 Paul Walker <[email protected]> (d3fd07d0016c)
* init.c: Use %p instead of %x to debug-print pointers (fixes warnings
on 64bit platforms)
2008-05-19 10:56 +0200 Rocco Rutte <[email protected]> (771276a3bace)
* ChangeLog, Makefile.am: hcversion.h depends on new mutt_md5 tool
2008-05-18 12:42 -0700 Roland Rosenfeld <[email protected]> (4ef0fc2f8378)
* po/de.po: Updated German translation
2008-05-17 19:31 -0700 Andreas <Andreas Jobs> (aaeee8f868c4)
* ChangeLog, crypt-gpgme.c: Fix GPGME S/MIME micalg generation, broken
in [e6f958b093b6]. Closes #2994.
2008-05-17 18:34 -0700 Brendan Cully <[email protected]> (f9545d5ec15f)
* doc/Muttrc.head: Add 'mime_lookup application/octet-stream' to the
......
......@@ -83,6 +83,7 @@ pgpring_DEPENDENCIES = @[email protected] $(INTLDEPS)
mutt_md5_SOURCES = md5.c
mutt_md5_CFLAGS = -DMD5UTIL
mutt_md5_LDADD =
noinst_PROGRAMS = $(MUTT_MD5)
......@@ -119,7 +120,7 @@ reldate.h: $(srcdir)/ChangeLog
cmp -s reldate.h.tmp reldate.h || cp reldate.h.tmp reldate.h; \
rm reldate.h.tmp
hcversion.h: $(srcdir)/mutt.h $(srcdir)/rfc822.h hcachever.sh
hcversion.h: $(srcdir)/mutt.h $(srcdir)/rfc822.h hcachever.sh $(MUTT_MD5)
( echo '#include "config.h"'; echo '#include "mutt.h"'; ) \
| $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - | sh ./hcachever.sh hcversion.h
......
......@@ -9,6 +9,8 @@ The keys used are:
+ $time_inc suppresses progress updates less than $time_inc
milliseconds apart.
+ 'mime_lookup application/octet-stream' added to system Muttrc
1.5.18 (2008-05-17):
+ $time_inc (control rate of progress updates)
......
......@@ -943,8 +943,8 @@ static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *err)
/* Find the last item in the list that data points to. */
lastp = NULL;
dprint(5, (debugfile, "parse_attach_list: ldata = %08x, *ldata = %08x\n",
(unsigned int)ldata, (unsigned int)*ldata));
dprint(5, (debugfile, "parse_attach_list: ldata = %p, *ldata = %p\n",
(void *)ldata, (void *)*ldata));
for (listp = *ldata; listp; listp = listp->next)
{
a = (ATTACH_MATCH *)listp->data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment