[asterisk-commits] mmichelson: branch mmichelson/1.4-test r69801 - /team/mmichelson/1.4-test/apps/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Jun 18 15:30:49 2007
New Revision: 69801

URL: http://svn.digium.com/view/asterisk?view=rev&rev=69801
Log:
Another fix to hopefully retrieve greetings properly.


Modified:
    team/mmichelson/1.4-test/apps/app_voicemail.c

Modified: team/mmichelson/1.4-test/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/1.4-test/apps/app_voicemail.c?view=diff&rev=69801&r1=69800&r2=69801
==============================================================================
--- team/mmichelson/1.4-test/apps/app_voicemail.c (original)
+++ team/mmichelson/1.4-test/apps/app_voicemail.c Mon Jun 18 15:30:49 2007
@@ -4682,7 +4682,7 @@
 
 	if(box == 0 || box == 1)
 		sprintf(spec, "%s%s", tmp, use_folder? imapfolder: "INBOX");
-	else if ( box == GREETING_FOLDER)
+	else if (box == GREETING_FOLDER)
 		sprintf(spec, "%s%s", tmp, "greetings");
 	else
 		sprintf(spec, "%s%s%c%s", tmp, imapfolder, delimiter, mbox(box));
@@ -4811,7 +4811,6 @@
 	struct vm_state *vms_p;
 	char *file, *filename;
 	char *attachment;
-	char folder[256];
 	/*char *mb, *cur;*/
 	int ret = 0, i;
 	BODY *body;
@@ -4874,14 +4873,12 @@
 		}
 	}
 	
-	ret = init_mailstream(vms_p, 0);
+	ret = init_mailstream(vms_p, GREETING_FOLDER);
 	if (!vms_p->mailstream) {
 		ast_log (LOG_ERROR,"IMAP mailstream is NULL\n");
 		free_user(vmu);
 		return -1;
 	}
-
-	imap_mailbox_name(folder, vms_p, GREETING_FOLDER, 1);
 
 	for (i = 0; i < vms_p->mailstream->nmsgs; i++)
 	{