projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
and even less very old hacks.
[apps/madmutt.git]
/
curs_main.c
diff --git
a/curs_main.c
b/curs_main.c
index
88ec80e
..
80872d0
100644
(file)
--- a/
curs_main.c
+++ b/
curs_main.c
@@
-17,12
+17,12
@@
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-lib/mapping.h>
#include "mutt.h"
#include "mutt_curses.h"
#include "mx.h"
#include "mutt_menu.h"
#include "mutt.h"
#include "mutt_curses.h"
#include "mx.h"
#include "mutt_menu.h"
-#include "mapping.h"
#include "sort.h"
#include "recvattach.h"
#include "buffy.h"
#include "sort.h"
#include "recvattach.h"
#include "buffy.h"
@@
-113,7
+113,6
@@
static const char *No_visible = N_("No visible messages.");
#define UNREAD(h) mutt_thread_contains_unread (Context, h)
#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
#define UNREAD(h) mutt_thread_contains_unread (Context, h)
#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
-extern const char *ReleaseDate;
extern size_t UngetCount;
void index_make_entry (char *s, size_t l, MUTTMENU * menu, int num)
extern size_t UngetCount;
void index_make_entry (char *s, size_t l, MUTTMENU * menu, int num)
@@
-262,7
+261,7
@@
static int mx_toggle_write (CONTEXT * ctx)
return 0;
}
return 0;
}
-static void update_index (MUTTMENU * menu, CONTEXT * ctx, int check,
+static void update_index (MUTTMENU * menu, CONTEXT * ctx
__attribute__ ((unused))
, int check,
int oldcount, int index_hint)
{
/* store pointers to the newly added messages */
int oldcount, int index_hint)
{
/* store pointers to the newly added messages */
@@
-310,13
+309,13
@@
static void update_index (MUTTMENU * menu, CONTEXT * ctx, int check,
/* uncollapse threads with new mail */
if ((Sort & SORT_MASK) == SORT_THREADS) {
if (check == M_REOPENED) {
/* uncollapse threads with new mail */
if ((Sort & SORT_MASK) == SORT_THREADS) {
if (check == M_REOPENED) {
- THREAD *h, *
j
;
+ THREAD *h, *
c
;
Context->collapsed = 0;
for (h = Context->tree; h; h = h->next) {
Context->collapsed = 0;
for (h = Context->tree; h; h = h->next) {
- for (
j = h; !j->message; j = j
->child);
- mutt_uncollapse_thread (Context,
j
->message);
+ for (
c = h; !c->message; c = c
->child);
+ mutt_uncollapse_thread (Context,
c
->message);
}
mutt_set_virtual (Context);
}
}
mutt_set_virtual (Context);
}
@@
-420,14
+419,14
@@
int mutt_index_menu (void)
char *cp; /* temporary variable. */
int index_hint; /* used to restore cursor position */
int do_buffy_notify = 1;
char *cp; /* temporary variable. */
int index_hint; /* used to restore cursor position */
int do_buffy_notify = 1;
- int close = 0; /* did we OP_QUIT or OP_EXIT out of this menu? */
+ int close
d
= 0; /* did we OP_QUIT or OP_EXIT out of this menu? */
int attach_msg = option (OPTATTACHMSG);
menu = mutt_new_menu ();
menu->menu = MENU_MAIN;
menu->offset = 1;
menu->pagelen = LINES - 3;
int attach_msg = option (OPTATTACHMSG);
menu = mutt_new_menu ();
menu->menu = MENU_MAIN;
menu->offset = 1;
menu->pagelen = LINES - 3;
- menu->make_entry = index_make_entry;
+ menu->make_entry =
(void *)
index_make_entry;
menu->color = index_color;
menu->current = ci_first_message ();
menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_MAIN,
menu->color = index_color;
menu->current = ci_first_message ();
menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_MAIN,
@@
-767,7
+766,7
@@
int mutt_index_menu (void)
break;
}
break;
}
-
strfcpy (buf, ref->data, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), ref->data
);
}
if (!Context->id_hash)
Context->id_hash = mutt_make_id_hash (Context);
}
if (!Context->id_hash)
Context->id_hash = mutt_make_id_hash (Context);
@@
-813,7
+812,7
@@
int mutt_index_menu (void)
if (!Context->id_hash)
Context->id_hash = mutt_make_id_hash (Context);
if (!Context->id_hash)
Context->id_hash = mutt_make_id_hash (Context);
-
strfcpy (buf, CURHDR->env->message_id, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), CURHDR->env->message_id
);
if (op == OP_RECONSTRUCT_THREAD) {
LIST *ref = CURHDR->env->references;
if (op == OP_RECONSTRUCT_THREAD) {
LIST *ref = CURHDR->env->references;
@@
-822,7
+821,7
@@
int mutt_index_menu (void)
nntp_check_msgid (Context, ref->data);
/* the last msgid in References is the root message */
if (!ref->next)
nntp_check_msgid (Context, ref->data);
/* the last msgid in References is the root message */
if (!ref->next)
-
strfcpy (buf, ref->data, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), ref->data
);
ref = ref->next;
}
}
ref = ref->next;
}
}
@@
-935,11
+934,11
@@
int mutt_index_menu (void)
mutt_message (_("No limit pattern is in effect."));
else {
mutt_message (_("No limit pattern is in effect."));
else {
- char buf[STRING];
+ char buf
fer
[STRING];
/* i18n: ask for a limit to apply */
/* i18n: ask for a limit to apply */
- snprintf (buf
, sizeof (buf
), _("Limit: %s"), Context->pattern);
- mutt_message ("%s", buf);
+ snprintf (buf
fer, sizeof (buffer
), _("Limit: %s"), Context->pattern);
+ mutt_message ("%s", buf
fer
);
}
break;
}
break;
@@
-951,16
+950,16
@@
int mutt_index_menu (void)
&& menu->current <
Context->vcount) ? CURHDR->index : -1;
if (op == OP_TOGGLE_READ) {
&& menu->current <
Context->vcount) ? CURHDR->index : -1;
if (op == OP_TOGGLE_READ) {
- char buf[LONG_STRING];
+ char buf
fer
[LONG_STRING];
if (!Context->pattern
|| strncmp (Context->pattern, "!~R!~D~s", 8) != 0) {
if (!Context->pattern
|| strncmp (Context->pattern, "!~R!~D~s", 8) != 0) {
- snprintf (buf
, sizeof (buf
), "!~R!~D~s%s",
+ snprintf (buf
fer, sizeof (buffer
), "!~R!~D~s%s",
Context->pattern ? Context->pattern : ".*");
set_option (OPTHIDEREAD);
}
else {
Context->pattern ? Context->pattern : ".*");
set_option (OPTHIDEREAD);
}
else {
-
strfcpy (buf, Context->pattern + 8, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), Context->pattern + 8
);
if (!*buf || strncmp (buf, ".*", 2) == 0)
snprintf (buf, sizeof (buf), "~A");
unset_option (OPTHIDEREAD);
if (!*buf || strncmp (buf, ".*", 2) == 0)
snprintf (buf, sizeof (buf), "~A");
unset_option (OPTHIDEREAD);
@@
-995,7
+994,7
@@
int mutt_index_menu (void)
case OP_QUIT:
case OP_QUIT:
- close = op;
+ close
d
= op;
if (attach_msg) {
done = 1;
break;
if (attach_msg) {
done = 1;
break;
@@
-1123,7
+1122,7
@@
int mutt_index_menu (void)
CHECK_READONLY;
{
int oldvcount = Context->vcount;
CHECK_READONLY;
{
int oldvcount = Context->vcount;
-
int
oldcount = Context->msgcount;
+ oldcount = Context->msgcount;
int dcount = 0;
int check;
int dcount = 0;
int check;
@@
-1234,18
+1233,15
@@
int mutt_index_menu (void)
mutt_error (_("%s is not a mailbox."), buf);
break;
}
mutt_error (_("%s is not a mailbox."), buf);
break;
}
-
str_replace
(&CurrentFolder, buf);
+
m_strreplace
(&CurrentFolder, buf);
if (Context) {
int check;
if (Context) {
int check;
-#ifdef USE_COMPRESSED
if (Context->compressinfo && Context->realpath)
if (Context->compressinfo && Context->realpath)
-
str_replace
(&LastFolder, Context->realpath);
+
m_strreplace
(&LastFolder, Context->realpath);
else
else
-#endif
-
- str_replace (&LastFolder, Context->path);
+ m_strreplace(&LastFolder, Context->path);
oldcount = Context ? Context->msgcount : 0;
if ((check = mx_close_mailbox (Context, &index_hint)) != 0) {
oldcount = Context ? Context->msgcount : 0;
if ((check = mx_close_mailbox (Context, &index_hint)) != 0) {
@@
-1327,7
+1323,7
@@
int mutt_index_menu (void)
case OP_EXIT:
case OP_EXIT:
- close = op;
+ close
d
= op;
if (menu->menu == MENU_MAIN && attach_msg) {
done = 1;
break;
if (menu->menu == MENU_MAIN && attach_msg) {
done = 1;
break;
@@
-1513,9
+1509,6
@@
int mutt_index_menu (void)
case OP_DECRYPT_COPY:
case OP_DECRYPT_SAVE:
case OP_DECRYPT_COPY:
case OP_DECRYPT_SAVE:
- if (!WithCrypto)
- break;
- /* fall thru */
case OP_COPY_MESSAGE:
case OP_SAVE:
case OP_DECODE_COPY:
case OP_COPY_MESSAGE:
case OP_SAVE:
case OP_DECODE_COPY:
@@
-2072,8
+2065,6
@@
int mutt_index_menu (void)
break;
case OP_MAIL_KEY:
break;
case OP_MAIL_KEY:
- if (!(WithCrypto & APPLICATION_PGP))
- break;
CHECK_ATTACH;
ci_send_message (SENDKEY, NULL, NULL, NULL, NULL);
menu->redraw = REDRAW_FULL;
CHECK_ATTACH;
ci_send_message (SENDKEY, NULL, NULL, NULL, NULL);
menu->redraw = REDRAW_FULL;
@@
-2081,8
+2072,6
@@
int mutt_index_menu (void)
case OP_EXTRACT_KEYS:
case OP_EXTRACT_KEYS:
- if (!WithCrypto)
- break;
CHECK_MSGCOUNT;
CHECK_VISIBLE;
crypt_extract_keys_from_messages (tag ? NULL : CURHDR);
CHECK_MSGCOUNT;
CHECK_VISIBLE;
crypt_extract_keys_from_messages (tag ? NULL : CURHDR);
@@
-2091,8
+2080,6
@@
int mutt_index_menu (void)
case OP_CHECK_TRADITIONAL:
case OP_CHECK_TRADITIONAL:
- if (!(WithCrypto & APPLICATION_PGP))
- break;
CHECK_MSGCOUNT;
CHECK_VISIBLE;
if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED))
CHECK_MSGCOUNT;
CHECK_VISIBLE;
if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED))
@@
-2387,7
+2374,7
@@
int mutt_index_menu (void)
}
mutt_menuDestroy (&menu);
}
mutt_menuDestroy (&menu);
- return (close);
+ return (close
d
);
}
void mutt_set_header_color (CONTEXT * ctx, HEADER * curhdr)
}
void mutt_set_header_color (CONTEXT * ctx, HEADER * curhdr)