#include <lib-sys/unix.h>
-#include <lib-ui/curses.h>
-#include <lib-ui/enter.h>
+#include <lib-ui/lib-ui.h>
#include <lib-ui/menu.h>
#include "alias.h"
#define RSORT(x) (SortAlias & SORT_REVERSE) ? -x : x
-static struct mapping_t AliasHelp[] = {
- {N_("Exit"), OP_EXIT},
- {N_("Del"), OP_DELETE},
- {N_("Undel"), OP_UNDELETE},
- {N_("Select"), OP_GENERIC_SELECT_ENTRY},
- {N_("Help"), OP_HELP},
- {NULL, OP_NULL}
-};
-
static void mutt_alias_menu(char *, size_t, alias_t *);
const address_t *alias_lookup(const char *s)
if (!addr->mailbox)
return 0;
- if (!ascii_strcasecmp(addr->mailbox, MCore.username)
- || string_is_address(addr->mailbox, MCore.username, MCore.shorthost)
- || string_is_address(addr->mailbox, MCore.username, mutt_fqdn(0))
- || string_is_address(addr->mailbox, MCore.username, mutt_fqdn(1))
+ if (!ascii_strcasecmp(addr->mailbox, mod_core.username)
+ || string_is_address(addr->mailbox, mod_core.username, mod_core.shorthost)
+ || string_is_address(addr->mailbox, mod_core.username, mutt_fqdn(0))
+ || string_is_address(addr->mailbox, mod_core.username, mutt_fqdn(1))
|| (MAlias.from && !ascii_strcasecmp(MAlias.from->mailbox, addr->mailbox)))
{
return 1;
if (pw) {
char namebuf[STRING];
- mutt_gecos_name(namebuf, sizeof(namebuf), pw, MCore.gecos_mask);
+ mutt_gecos_name(namebuf, sizeof(namebuf), pw, mod_core.gecos_mask);
m_strreplace(&pop->personal, namebuf);
}
}
last = address_list_append(last, pop);
}
- if (MCore.use_domain) {
+ if (mod_core.use_domain) {
/* now qualify all local addresses */
rfc822_qualify(head, mutt_fqdn(1));
}
static void alias_entry(char *s, ssize_t slen, MUTTMENU *m, int num)
{
- m_strformat(s, slen, COLS - SW, MAlias.alias_format, alias_format_str,
- ((alias_t **)m->data)[num],
- option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
+ m_strformat(s, slen, getmaxx(main_w), MAlias.alias_format, alias_format_str,
+ ((alias_t **)m->data)[num], 0);
}
static int alias_tag (MUTTMENU * menu, int n, int m)
alias_t *pb = *(alias_t **) b;
int r = m_strcasecmp(pa->name, pb->name);
- return (RSORT (r));
+ return RSORT (r);
}
static int alias_SortAddress (const void *a, const void *b)
r = -1;
else
r = ascii_strcasecmp (pa->mailbox, pb->mailbox);
- return (RSORT (r));
+ return RSORT (r);
}
void mutt_alias_menu (char *buf, size_t buflen, alias_t * aliases)
int t = -1;
int i, done = 0;
int op;
- char helpstr[STRING];
int omax;
menu->tag = alias_tag;
menu->menu = MENU_ALIAS;
menu->title = _("Aliases");
- menu->help = mutt_compile_help(helpstr, sizeof(helpstr),
- MENU_ALIAS, AliasHelp);
new_aliases: