[asterisk-commits] mmichelson: trunk r93094 - /trunk/apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Dec 14 15:40:34 2007
New Revision: 93094

URL: http://svn.digium.com/view/asterisk?view=rev&rev=93094
Log:
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.


Modified:
    trunk/apps/app_voicemail.c

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=93094&r1=93093&r2=93094
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Fri Dec 14 15:40:34 2007
@@ -2273,7 +2273,11 @@
 static const char *mbox(int id)
 {
 	static const char *msgs[] = {
+#ifdef IMAP_STORAGE
+		imapfolder,
+#else
 		"INBOX",
+#endif
 		"Old",
 		"Work",
 		"Family",
@@ -2292,7 +2296,11 @@
 	/*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 @@
 		mailboxnc = (char *)mailbox_context;
 	}
 	if (newmsgs) {
-		if((*newmsgs = messagecount(context, mailboxnc, "INBOX")) < 0)
+		if((*newmsgs = messagecount(context, mailboxnc, imapfolder)) < 0)
 			return -1;
 	}
 	if (oldmsgs) {