#include <lib-lib/lib-lib.h>
#include <lib-lua/lib-lua.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
#include <lib-mx/mx.h>
#include <lib-mx/compress.h>
goto error;
}
- mutt_extract_token (&command, s,
- (data &
- (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK |
- M_ACCOUNTHOOK | M_REPLYHOOK)) ? M_TOKEN_SPACE : 0);
+ mutt_extract_token(&command, s, (data & (M_FOLDERHOOK | M_SENDHOOK |
+ M_SEND2HOOK | M_REPLYHOOK)) ?
+ M_TOKEN_SPACE : 0);
if (!command.data) {
m_strcpy(err->data, err->dsize, _("too few arguments"));
return (-1);
}
}
- else if (DefaultHook && !(data & M_ACCOUNTHOOK) && !(data & M_CRYPTHOOK))
+ else if (DefaultHook && !(data & M_CRYPTHOOK))
{
char tmp[HUGE_STRING];
for (ptr = Hooks; ptr; ptr = ptr->next) {
if (ptr->type == (int)data &&
ptr->rx.neg == neg && !m_strcmp(pattern.data, ptr->rx.pattern)) {
- if (data &
- (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK |
- M_ACCOUNTHOOK | M_REPLYHOOK)) {
+ if (data & (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK |
+ M_REPLYHOOK))
+ {
/* these hooks allow multiple commands with the same
* pattern, so if we've already seen this pattern/command pair, just
* ignore it instead of creating a duplicate */
{
lua_State *L = luaM_getruntime();
- lua_getfield(L, LUA_GLOBALSINDEX, "MCore");
+ lua_getfield(L, LUA_GLOBALSINDEX, "mod_core");
lua_getfield(L, -1, "folder_hook");
lua_remove(L, -2);
if (lua_isfunction(L, -1)) {
{
return _mutt_string_hook (adr->mailbox, M_CRYPTHOOK);
}
-
-void mutt_account_hook (const char *url)
-{
- hook_t *hook;
- BUFFER token;
- BUFFER err;
- char buf[STRING];
-
- err.data = buf;
- err.dsize = sizeof (buf);
- p_clear(&token, 1);
-
- for (hook = Hooks; hook; hook = hook->next) {
- if (!(hook->command && (hook->type & M_ACCOUNTHOOK)))
- continue;
-
- if ((regexec (hook->rx.rx, url, 0, NULL, 0) == 0) ^ hook->rx.neg) {
- if (mutt_parse_rc_line (hook->command, &token, &err) == -1) {
- mutt_error ("%s", err.data);
- mutt_sleep (1);
- }
- }
- }
-
- p_delete(&token.data);
-}