mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	Change places where the name "INBOX" was hardcoded to use the imapfolder
setting from voicemail.conf instead. This commit will help to get issue #11415 moving towards commitment. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93094 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -2273,7 +2273,11 @@ static void free_zone(struct vm_zone *z) | ||||
| static const char *mbox(int id) | ||||
| { | ||||
| 	static const char *msgs[] = { | ||||
| #ifdef IMAP_STORAGE | ||||
| 		imapfolder, | ||||
| #else | ||||
| 		"INBOX", | ||||
| #endif | ||||
| 		"Old", | ||||
| 		"Work", | ||||
| 		"Family", | ||||
| @@ -2292,7 +2296,11 @@ static int folder_int(const char *folder) | ||||
| 	/*assume a NULL folder means INBOX*/ | ||||
| 	if (!folder) | ||||
| 		return 0; | ||||
| 	if(!strcasecmp(folder, "INBOX")) | ||||
| #ifdef IMAP_STORAGE | ||||
| 	if (!strcasecmp(folder, imapfolder)) | ||||
| #else | ||||
| 	if (!strcasecmp(folder, "INBOX")) | ||||
| #endif | ||||
| 		return 0; | ||||
| 	else if (!strcasecmp(folder, "Old")) | ||||
| 		return 1; | ||||
| @@ -2706,7 +2714,7 @@ static int inboxcount(const char *mailbox_context, int *newmsgs, int *oldmsgs) | ||||
| 		mailboxnc = (char *)mailbox_context; | ||||
| 	} | ||||
| 	if (newmsgs) { | ||||
| 		if((*newmsgs = messagecount(context, mailboxnc, "INBOX")) < 0) | ||||
| 		if((*newmsgs = messagecount(context, mailboxnc, imapfolder)) < 0) | ||||
| 			return -1; | ||||
| 	} | ||||
| 	if (oldmsgs) { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user