[Asterisk-cvs] asterisk/apps Makefile,1.26,1.27 app_voicemail.c,1.14,1.15 app_voicemail2.c,1.65,NONE

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv7023/apps

Modified Files:
	Makefile app_voicemail.c 
Removed Files:
	app_voicemail2.c 
Log Message:
Move voicemail2 to voicemail, retain compatibility with "Voicemail2"


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/Makefile,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Makefile	10 Nov 2003 04:47:43 -0000	1.26
+++ Makefile	13 Nov 2003 01:47:24 -0000	1.27
@@ -23,7 +23,7 @@
      app_setcidname.so app_lookupcidname.so app_substring.so app_macro.so \
      app_authenticate.so app_softhangup.so app_lookupblacklist.so \
      app_waitforring.so app_privacy.so app_db.so app_chanisavail.so \
-     app_enumlookup.so app_voicemail2.so app_transfer.so app_setcidnum.so app_cdr.so \
+     app_enumlookup.so app_transfer.so app_setcidnum.so app_cdr.so \
      app_hasnewvoicemail.so app_sayunixtime.so app_cut.so app_read.so
 
 ifneq (${OSARCH},Darwin)

Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- app_voicemail.c	8 Sep 2003 16:48:06 -0000	1.14
+++ app_voicemail.c	13 Nov 2003 01:47:24 -0000	1.15
@@ -3,9 +3,9 @@
  *
  * Voicemail System (did you ever think it could be so easy?)
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 2003, Digium Inc.
  *
- * Mark Spencer <markster at linux-support.net>
+ * Mark Spencer <markster at digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
[...3232 lines suppressed...]
 	res = ast_register_application(app, vm_exec, synopsis_vm, descrip_vm);
-	if (!res)
-		res = ast_register_application(app2, vm_execmain, synopsis_vmain, descrip_vmain);
+	res |= ast_register_application(capp, vm_exec, synopsis_vm, descrip_vm);
+	res |= ast_register_application(app2, vm_execmain, synopsis_vmain, descrip_vmain);
+	res |= ast_register_application(capp2, vm_execmain, synopsis_vmain, descrip_vmain);
+	if (res)
+		return(res);
+
+	if ((res=load_config())) {
+		return(res);
+	}
+
+	if ((res = sql_init())) {
+		ast_log(LOG_WARNING, "SQL init\n");
+		return res;
+	}
 	return res;
 }
 

--- app_voicemail2.c DELETED ---