projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation warnings
[apps/madmutt.git]
/
flags.c
diff --git
a/flags.c
b/flags.c
index
fd3333f
..
fc3c4b4
100644
(file)
--- a/
flags.c
+++ b/
flags.c
@@
-7,22
+7,18
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
+#include <lib-ui/sidebar.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
#include "mutt.h"
-#include "mutt_curses.h"
-#include "mutt_menu.h"
#include "sort.h"
#include "sort.h"
-#include "mx.h"
-#include "sidebar.h"
-#ifdef USE_IMAP
-#include "imap_private.h"
-#endif
+#include <imap/imap_private.h>
-#include "lib/intl.h"
void _mutt_set_flag (CONTEXT * ctx, HEADER * h, int flag, int bf, int upd_ctx)
{
void _mutt_set_flag (CONTEXT * ctx, HEADER * h, int flag, int bf, int upd_ctx)
{
@@
-45,7
+41,6
@@
void _mutt_set_flag (CONTEXT * ctx, HEADER * h, int flag, int bf, int upd_ctx)
h->deleted = 1;
if (upd_ctx)
ctx->deleted++;
h->deleted = 1;
if (upd_ctx)
ctx->deleted++;
-#ifdef USE_IMAP
/* deleted messages aren't treated as changed elsewhere so that the
* purge-on-sync option works correctly. This isn't applicable here */
if (ctx && ctx->magic == M_IMAP) {
/* deleted messages aren't treated as changed elsewhere so that the
* purge-on-sync option works correctly. This isn't applicable here */
if (ctx && ctx->magic == M_IMAP) {
@@
-53,7
+48,6
@@
void _mutt_set_flag (CONTEXT * ctx, HEADER * h, int flag, int bf, int upd_ctx)
if (upd_ctx)
ctx->changed = 1;
}
if (upd_ctx)
ctx->changed = 1;
}
-#endif
}
}
else if (h->deleted) {
}
}
else if (h->deleted) {
@@
-64,14
+58,12
@@
void _mutt_set_flag (CONTEXT * ctx, HEADER * h, int flag, int bf, int upd_ctx)
ctx->appended--;
}
h->appended = 0; /* when undeleting, also reset the appended flag */
ctx->appended--;
}
h->appended = 0; /* when undeleting, also reset the appended flag */
-#ifdef USE_IMAP
/* see my comment above */
if (ctx->magic == M_IMAP) {
h->changed = 1;
if (upd_ctx)
ctx->changed = 1;
}
/* see my comment above */
if (ctx->magic == M_IMAP) {
h->changed = 1;
if (upd_ctx)
ctx->changed = 1;
}
-#endif
/*
* If the user undeletes a message which is marked as
* "trash" in the maildir folder on disk, the folder has
/*
* If the user undeletes a message which is marked as
* "trash" in the maildir folder on disk, the folder has
@@
-274,7
+266,7
@@
void _mutt_set_flag (CONTEXT * ctx, HEADER * h, int flag, int bf, int upd_ctx)
if (h->searched && (changed != h->changed || deleted != ctx->deleted ||
tagged != ctx->tagged || flagged != ctx->flagged))
h->searched = 0;
if (h->searched && (changed != h->changed || deleted != ctx->deleted ||
tagged != ctx->tagged || flagged != ctx->flagged))
h->searched = 0;
- sidebar_draw (
0
);
+ sidebar_draw ();
}
void mutt_tag_set_flag (int flag, int bf)
}
void mutt_tag_set_flag (int flag, int bf)
@@
-306,7
+298,7
@@
int mutt_thread_set_flag (HEADER * hdr, int flag, int bf, int subthread)
if ((cur = cur->child) == NULL)
return (0);
if ((cur = cur->child) == NULL)
return (0);
-
FOREVER
{
+
for (;;)
{
if (cur->message)
mutt_set_flag (Context, cur->message, flag, bf);
if (cur->message)
mutt_set_flag (Context, cur->message, flag, bf);