[asterisk-commits] mogorman: branch group/asterisk-imap r38822 - /team/group/asterisk-imap/apps/

[asterisk-commits at lists.digium.com]

Author: mogorman
Date: Thu Aug  3 13:49:42 2006
New Revision: 38822

URL: http://svn.digium.com/view/asterisk?rev=38822&view=rev
Log:
more commits to make this work

Modified:
    team/group/asterisk-imap/apps/app_voicemail.c

Modified: team/group/asterisk-imap/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/group/asterisk-imap/apps/app_voicemail.c?rev=38822&r1=38821&r2=38822&view=diff
==============================================================================
--- team/group/asterisk-imap/apps/app_voicemail.c (original)
+++ team/group/asterisk-imap/apps/app_voicemail.c Thu Aug  3 13:49:42 2006
@@ -377,7 +377,9 @@
 static int vm_tempgreeting(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, char *fmtc, signed char record_gain);
 static int vm_play_folder_name(struct ast_channel *chan, char *mbox);
 static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu, int msgnum, long duration, char *fmt, char *cidnum, char *cidname);
+#ifndef ODBC_STORAGE
 static int __has_voicemail(const char *context, const char *mailbox, const char *folder, int shortcircuit);
+#endif
 static void apply_options(struct ast_vm_user *vmu, const char *options);
 
 #ifdef ODBC_STORAGE
@@ -971,7 +973,6 @@
 	return 1;
 }
 
-#ifndef IMAP_STORAGE
 /* only return failure if ast_lock_path returns 'timeout',
    not if the path does not exist or any other reason
 */
@@ -984,7 +985,6 @@
 		return 0;
 	}
 }
-#endif
 
 
 #ifdef ODBC_STORAGE
@@ -1569,8 +1569,6 @@
 }
 
 #else
-
-#ifndef IMAP_STORAGE
 static int count_messages(struct ast_vm_user *vmu, char *dir)
 {
 	/* Find all .txt files - even if they are not in sequence from 0000 */
@@ -1683,7 +1681,6 @@
 
 	return x - 1;
 }
-#endif
 
 static int vm_delete(char *file)
 {