#include <lib-mime/mime.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
#include <lib-mx/mx.h>
buf[0] = 0;
rfc822_addrcat(buf, sizeof(buf), adr, 1);
-#define extra_space (15+7+2)
/*
* See commands.c.
*/
(p ? _("Bounce message to %s") : _("Bounce messages to %s")),
buf);
- if (m_strwidth(prompt) > COLS - extra_space) {
- mutt_format_string (prompt, sizeof (prompt) - 4,
- 0, COLS - extra_space, 0, 0,
+#define extra_space (15+7+2)
+ if (m_strwidth(prompt) > getmaxx(main_w) - extra_space) {
+ mutt_format_string (prompt, sizeof (prompt) - 4, 0,
+ getmaxx(main_w) - extra_space, 0, 0,
prompt, sizeof (prompt), 0);
m_strcat(prompt, sizeof(prompt), "...?");
} else {
m_strcat(prompt, sizeof(prompt), "?");
}
+#undef extra_space
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
address_list_wipe(&adr);
- CLEARLINE (LINES - 1);
+ CLEARLINE(main_w, LINES - 1);
mutt_message (p ? _("Message not bounced.") : _("Messages not bounced."));
return;
}
- CLEARLINE (LINES - 1);
+ CLEARLINE(main_w, LINES - 1);
if (cur)
ret = mutt_bounce_message (fp, cur->hdr, adr);
tmphdr->env = envelope_new();
mutt_make_forward_subject (tmphdr->env, Context, parent);
- tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(MCore.tmpdir), NULL);
+ tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(mod_core.tmpdir), NULL);
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
return;
/* no MIME encapsulation */
- tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(MCore.tmpdir), NULL);
+ tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(mod_core.tmpdir), NULL);
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
header_delete(&tmphdr);
return;
}
- tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(MCore.tmpdir), NULL);
+ tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(mod_core.tmpdir), NULL);
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
header_delete(&tmphdr);