projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge OPS that do not need to be split anymore.
[apps/madmutt.git]
/
buffy.c
diff --git
a/buffy.c
b/buffy.c
index
4a30783
..
4018c5f
100644
(file)
--- a/
buffy.c
+++ b/
buffy.c
@@
-10,15
+10,12
@@
* 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/mem.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
+#include <dirent.h>
+#include <utime.h>
#include <lib-ui/curses.h>
#include <lib-ui/curses.h>
+#include <lib-ui/sidebar.h>
#include <imap/imap.h>
#include <imap/imap.h>
@@
-26,17
+23,6
@@
#include "buffy.h"
#include "mx.h"
#include "mh.h"
#include "buffy.h"
#include "mx.h"
#include "mh.h"
-#include "sidebar.h"
-
-
-#include <string.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <utime.h>
-#include <ctype.h>
-#include <unistd.h>
-
-#include <stdio.h>
static time_t BuffyTime = 0; /* last time we started checking for mail */
static time_t BuffyTime = 0; /* last time we started checking for mail */
@@
-166,13
+152,13
@@
void buffy_update_mailbox (BUFFY * b)
#endif
/* func to free buffy for list_del() */
#endif
/* func to free buffy for list_del() */
-static void buffy_free (BUFFY** p) {
+static
inline
void buffy_free (BUFFY** p) {
p_delete(&(*p)->path);
p_delete(p);
}
int buffy_lookup (const char* path) {
p_delete(&(*p)->path);
p_delete(p);
}
int buffy_lookup (const char* path) {
-
unsigned
int i = 0;
+ int i = 0;
if (list_empty(Incoming) || !path || !*path)
return (-1);
for (i = 0; i < Incoming->length; i++) {
if (list_empty(Incoming) || !path || !*path)
return (-1);
for (i = 0; i < Incoming->length; i++) {
@@
-269,7
+255,7
@@
int buffy_check (int force)
struct stat contex_sb;
time_t now, last1;
CONTEXT *ctx;
struct stat contex_sb;
time_t now, last1;
CONTEXT *ctx;
-
unsigned
int i = 0;
+ int i = 0;
int local = 0, count = 0;
time_t last2;
int local = 0, count = 0;
time_t last2;
@@
-480,7
+466,7
@@
int buffy_check (int force)
tmp->has_new = tmp->new > 0;
}
if (BuffyCount > 0 && force != 2)
tmp->has_new = tmp->new > 0;
}
if (BuffyCount > 0 && force != 2)
- sidebar_draw (
CurrentMenu
);
+ sidebar_draw ();
return (BuffyCount);
}
return (BuffyCount);
}
@@
-492,7
+478,7
@@
int buffy_list (void)
int pos;
int first;
int have_unnotified = BuffyNotify;
int pos;
int first;
int have_unnotified = BuffyNotify;
-
unsigned
int i = 0;
+ int i = 0;
pos = 0;
first = 1;
pos = 0;
first = 1;
@@
-500,7
+486,7
@@
int buffy_list (void)
pos += m_strlen(strncat (buffylist, _("New mail in "), sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
if (Incoming) {
for (i = 0; i < Incoming->length; i++) {
pos += m_strlen(strncat (buffylist, _("New mail in "), sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
if (Incoming) {
for (i = 0; i < Incoming->length; i++) {
- tmp =
(BUFFY*)
Incoming->data[i];
+ tmp = Incoming->data[i];
/* Is there new mail in this mailbox? */
if (tmp->new <= 0 || (have_unnotified && tmp->notified))
continue;
/* Is there new mail in this mailbox? */
if (tmp->new <= 0 || (have_unnotified && tmp->notified))
continue;
@@
-514,12
+500,9
@@
int buffy_list (void)
if (!first)
pos += m_strlen(strncat (buffylist + pos, ", ", sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
if (!first)
pos += m_strlen(strncat (buffylist + pos, ", ", sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
- /* Prepend an asterisk to mailboxes not already notified */
- if (!tmp->notified) {
- /* pos += m_strlen(strncat(buffylist + pos, "*", sizeof(buffylist)-1-pos)); __STRNCAT_CHECKED__ */
- tmp->notified = 1;
- BuffyNotify--;
- }
+ tmp->notified = 1;
+ BuffyNotify--;
+
pos += m_strlen(strncat (buffylist + pos, path, sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
first = 0;
}
pos += m_strlen(strncat (buffylist + pos, path, sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
first = 0;
}
@@
-529,7
+512,7
@@
int buffy_list (void)
}
if (!first) {
/* on new mail: redraw sidebar */
}
if (!first) {
/* on new mail: redraw sidebar */
- sidebar_draw (
CurrentMenu
);
+ sidebar_draw ();
mutt_message ("%s", buffylist);
return (1);
}
mutt_message ("%s", buffylist);
return (1);
}
@@
-549,24
+532,21
@@
int buffy_notify (void)
}
/*
}
/*
- *
mutt_buffy
() -- incoming folders completion routine
+ *
buffy_next
() -- incoming folders completion routine
*
* given a folder name, this routine gives the next incoming folder with new
* new mail.
*/
void buffy_next (char *s, size_t slen)
{
*
* given a folder name, this routine gives the next incoming folder with new
* new mail.
*/
void buffy_next (char *s, size_t slen)
{
-
unsigned
int l = 0;
+ int l = 0;
int c = 0, i = 0;
int c = 0, i = 0;
- if (list_empty(Incoming))
- return;
-
mutt_expand_path (s, _POSIX_PATH_MAX);
mutt_expand_path (s, _POSIX_PATH_MAX);
- if (
buffy_check (0) == 0
) {
- *s = '\0';
- return;
- }
+ if (
!buffy_check (0)
) {
+
*s = '\0';
+
return;
+
}
/*
* If buffy_lookup returns the index,
/*
* If buffy_lookup returns the index,