projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tmp
[apps/madmutt.git]
/
lib-ui
/
hdrline.c
diff --git
a/lib-ui/hdrline.c
b/lib-ui/hdrline.c
index
24aa3de
..
5bbff4a
100644
(file)
--- a/
lib-ui/hdrline.c
+++ b/
lib-ui/hdrline.c
@@
-7,15
+7,14
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#include <lib-
lib/lib-lib
.h>
+#include <lib-
ui/lib-ui
.h>
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
-#include <lib-ui/curses.h>
#include <lib-mx/mx.h>
#include <lib-mx/mx.h>
-#include <lib-crypt/crypt.h>
#include "mutt.h"
#include "alias.h"
#include "mutt.h"
#include "alias.h"
+#include "crypt.h"
#include "sort.h"
#include "thread.h"
#include "charset.h"
#include "sort.h"
#include "thread.h"
#include "charset.h"
@@
-405,13
+404,6
@@
hdr_format_str(char *dest, ssize_t destlen,
optional = 0;
break;
optional = 0;
break;
-#ifdef USE_NNTP
- case 'g':
- mutt_format_s (dest, destlen, prefix,
- hdr->env->newsgroups ? hdr->env->newsgroups : "");
- break;
-#endif
-
case 'H':
/* (Hormel) spam score */
if (optional)
case 'H':
/* (Hormel) spam score */
if (optional)
@@
-498,7
+490,7
@@
hdr_format_str(char *dest, ssize_t destlen,
case 'O':
if (!optional) {
make_from_addr (hdr->env, buf2, sizeof (buf2), 1);
case 'O':
if (!optional) {
make_from_addr (hdr->env, buf2, sizeof (buf2), 1);
- if (
!option (OPTSAVEADDRESS) &&
(p = strpbrk (buf2, "%@")))
+ if ((p = strpbrk (buf2, "%@")))
*p = 0;
mutt_format_s (dest, destlen, prefix, buf2);
}
*p = 0;
mutt_format_s (dest, destlen, prefix, buf2);
}
@@
-756,5
+748,5
@@
_mutt_make_string (char *dest, ssize_t destlen, const char *s, CONTEXT * ctx,
hfi.hdr = hdr;
hfi.ctx = ctx;
hfi.hdr = hdr;
hfi.ctx = ctx;
- m_strformat(dest, destlen,
COLS - SW
, s, hdr_format_str, &hfi, flags);
+ m_strformat(dest, destlen,
getmaxx(main_w)
, s, hdr_format_str, &hfi, flags);
}
}