projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes in the sidebar format, was completely braindead.
[apps/madmutt.git]
/
compose.c
diff --git
a/compose.c
b/compose.c
index
3de34a9
..
d1a6098
100644
(file)
--- a/
compose.c
+++ b/
compose.c
@@
-14,8
+14,8
@@
#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
-
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
+#include <lib-crypt/crypt.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
@@
-114,13
+114,11
@@
static struct mapping_t ComposeNewsHelp[] = {
static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
int w=(COLS-SW)>blen?blen:COLS-SW;
static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
int w=(COLS-SW)>blen?blen:COLS-SW;
- m
utt_FormatString
(b, w, NONULL (AttachFormat), mutt_attach_fmt,
+ m
_strformat
(b, w, NONULL (AttachFormat), mutt_attach_fmt,
(unsigned long) (((ATTACHPTR **) menu->data)[num]),
(unsigned long) (((ATTACHPTR **) menu->data)[num]),
- M_FORMAT_STAT_FILE |
M_FORMAT_ARROWCURSOR
);
+ M_FORMAT_STAT_FILE |
(option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0)
);
}
}
-#include <lib-crypt/crypt.h>
-
static void redraw_crypt_lines (HEADER * msg)
{
int off = 0;
static void redraw_crypt_lines (HEADER * msg)
{
int off = 0;
@@
-203,7
+201,7
@@
static int check_attachments (ATTACHPTR ** idx, short idxlen)
{
int i, r;
struct stat st;
{
int i, r;
struct stat st;
- char pretty[_POSIX_PATH_MAX], msg[_POSIX_PATH_MAX + S
HORT_S
TRING];
+ char pretty[_POSIX_PATH_MAX], msg[_POSIX_PATH_MAX + STRING];
for (i = 0; i < idxlen; i++) {
m_strcpy(pretty, sizeof(pretty), idx[i]->content->filename);
for (i = 0; i < idxlen; i++) {
m_strcpy(pretty, sizeof(pretty), idx[i]->content->filename);
@@
-233,7
+231,7
@@
static void draw_envelope_addr (int line, address_t * addr)
char buf[STRING];
buf[0] = 0;
char buf[STRING];
buf[0] = 0;
- rfc822_
write_address
(buf, sizeof (buf), addr, 1);
+ rfc822_
addrcat
(buf, sizeof (buf), addr, 1);
mvprintw (line, SW, TITLE_FMT, Prompts[line - 1]);
mutt_paddstr (W, buf);
}
mvprintw (line, SW, TITLE_FMT, Prompts[line - 1]);
mutt_paddstr (W, buf);
}
@@
-283,7
+281,7
@@
static int edit_address_list (int line, address_t ** addr)
char *err = NULL;
mutt_addrlist_to_local (*addr);
char *err = NULL;
mutt_addrlist_to_local (*addr);
- rfc822_
write_address
(buf, sizeof (buf), *addr, 0);
+ rfc822_
addrcat
(buf, sizeof (buf), *addr, 0);
if (mutt_get_field (Prompts[line - 1], buf, sizeof (buf), M_ALIAS) == 0) {
address_list_wipe(addr);
*addr = mutt_parse_adrlist (*addr, buf);
if (mutt_get_field (Prompts[line - 1], buf, sizeof (buf), M_ALIAS) == 0) {
address_list_wipe(addr);
*addr = mutt_parse_adrlist (*addr, buf);
@@
-303,7
+301,7
@@
static int edit_address_list (int line, address_t ** addr)
/* redraw the expanded list so the user can see the result */
buf[0] = 0;
/* redraw the expanded list so the user can see the result */
buf[0] = 0;
- rfc822_
write_address
(buf, sizeof (buf), *addr, 1);
+ rfc822_
addrcat
(buf, sizeof (buf), *addr, 1);
move (line, HDR_XOFFSET + SW);
mutt_paddstr (W, buf);
move (line, HDR_XOFFSET + SW);
mutt_paddstr (W, buf);
@@
-364,7
+362,7
@@
static void update_idx (MUTTMENU * menu, ATTACHPTR ** idx, short idxlen)
* applied.
*
*/
* applied.
*
*/
-static unsigned long cum_attachs_size
(MUTTMENU * menu)
+static unsigned long cum_attachs_size(MUTTMENU * menu)
{
ssize_t s;
unsigned short i;
{
ssize_t s;
unsigned short i;
@@
-416,7
+414,7
@@
static const char *compose_format_str (char *buf, ssize_t buflen, char op,
const char *elsestring,
unsigned long data, format_flag flags)
{
const char *elsestring,
unsigned long data, format_flag flags)
{
- char fmt[S
HORT_STRING], tmp[SHORT_
STRING];
+ char fmt[S
TRING], tmp[
STRING];
int optional = (flags & M_FORMAT_OPTIONAL);
MUTTMENU *menu = (MUTTMENU *) data;
int optional = (flags & M_FORMAT_OPTIONAL);
MUTTMENU *menu = (MUTTMENU *) data;
@@
-463,8
+461,7
@@
static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
const char *p)
{
int w=(COLS-SW)>buflen?buflen:(COLS-SW);
const char *p)
{
int w=(COLS-SW)>buflen?buflen:(COLS-SW);
- mutt_FormatString (buf, w, p, compose_format_str,
- (unsigned long) menu, 0);
+ m_strformat(buf, w, p, compose_format_str, (unsigned long)menu, 0);
}
/* return values:
}
/* return values:
@@
-478,7
+475,7
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
ssize_t fcclen,
HEADER * cur __attribute__ ((unused)))
{ /* current message */
ssize_t fcclen,
HEADER * cur __attribute__ ((unused)))
{ /* current message */
- char helpstr[S
HORT_S
TRING];
+ char helpstr[STRING];
char buf[LONG_STRING];
char fname[_POSIX_PATH_MAX];
MUTTMENU *menu;
char buf[LONG_STRING];
char fname[_POSIX_PATH_MAX];
MUTTMENU *menu;
@@
-692,9
+689,7
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
menu->redraw = REDRAW_FULL;
mutt_message_hook (NULL, msg, M_SEND2HOOK);
menu->redraw = REDRAW_FULL;
mutt_message_hook (NULL, msg, M_SEND2HOOK);
- break;
-
-
+ break;
case OP_COMPOSE_ATTACH_KEY:
if (idxlen == idxmax) {
case OP_COMPOSE_ATTACH_KEY:
if (idxlen == idxmax) {
@@
-719,8
+714,7
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
}
mutt_message_hook (NULL, msg, M_SEND2HOOK);
}
mutt_message_hook (NULL, msg, M_SEND2HOOK);
- break;
-
+ break;
case OP_COMPOSE_ATTACH_FILE:
{
case OP_COMPOSE_ATTACH_FILE:
{
@@
-1278,8
+1272,6
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
}
break;
}
break;
-
-
case OP_COMPOSE_PGP_MENU:
if (msg->security & APPLICATION_SMIME) {
if (mutt_yesorno (_("S/MIME already selected. Clear & continue ? "),
case OP_COMPOSE_PGP_MENU:
if (msg->security & APPLICATION_SMIME) {
if (mutt_yesorno (_("S/MIME already selected. Clear & continue ? "),
@@
-1294,12
+1286,10
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
-
case OP_FORGET_PASSPHRASE:
crypt_forget_passphrase ();
break;
case OP_FORGET_PASSPHRASE:
crypt_forget_passphrase ();
break;
-
case OP_COMPOSE_SMIME_MENU:
if (msg->security & APPLICATION_PGP) {
if (mutt_yesorno (_("PGP already selected. Clear & continue ? "),
case OP_COMPOSE_SMIME_MENU:
if (msg->security & APPLICATION_PGP) {
if (mutt_yesorno (_("PGP already selected. Clear & continue ? "),