|
|
@ -2273,7 +2273,11 @@ static void free_zone(struct vm_zone *z)
|
|
|
|
static const char *mbox(int id)
|
|
|
|
static const char *mbox(int id)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
static const char *msgs[] = {
|
|
|
|
static const char *msgs[] = {
|
|
|
|
|
|
|
|
#ifdef IMAP_STORAGE
|
|
|
|
|
|
|
|
imapfolder,
|
|
|
|
|
|
|
|
#else
|
|
|
|
"INBOX",
|
|
|
|
"INBOX",
|
|
|
|
|
|
|
|
#endif
|
|
|
|
"Old",
|
|
|
|
"Old",
|
|
|
|
"Work",
|
|
|
|
"Work",
|
|
|
|
"Family",
|
|
|
|
"Family",
|
|
|
@ -2292,7 +2296,11 @@ static int folder_int(const char *folder)
|
|
|
|
/*assume a NULL folder means INBOX*/
|
|
|
|
/*assume a NULL folder means INBOX*/
|
|
|
|
if (!folder)
|
|
|
|
if (!folder)
|
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
|
if(!strcasecmp(folder, "INBOX"))
|
|
|
|
#ifdef IMAP_STORAGE
|
|
|
|
|
|
|
|
if (!strcasecmp(folder, imapfolder))
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
if (!strcasecmp(folder, "INBOX"))
|
|
|
|
|
|
|
|
#endif
|
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
|
else if (!strcasecmp(folder, "Old"))
|
|
|
|
else if (!strcasecmp(folder, "Old"))
|
|
|
|
return 1;
|
|
|
|
return 1;
|
|
|
@ -2706,7 +2714,7 @@ static int inboxcount(const char *mailbox_context, int *newmsgs, int *oldmsgs)
|
|
|
|
mailboxnc = (char *)mailbox_context;
|
|
|
|
mailboxnc = (char *)mailbox_context;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (newmsgs) {
|
|
|
|
if (newmsgs) {
|
|
|
|
if((*newmsgs = messagecount(context, mailboxnc, "INBOX")) < 0)
|
|
|
|
if((*newmsgs = messagecount(context, mailboxnc, imapfolder)) < 0)
|
|
|
|
return -1;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (oldmsgs) {
|
|
|
|
if (oldmsgs) {
|
|
|
|