Merged revisions 134086 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r134086 | kpfleming | 2008-07-28 11:42:00 -0500 (Mon, 28 Jul 2008) | 3 lines

remove remaining Zaptel references in various places


........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134087 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 0 insertions, 8 deletions

diff --git a/apps/app_dahdibarge.c b/apps/app_dahdibarge.c
index 25b6f0268..04c6af045 100644
--- a/apps/app_dahdibarge.c
+++ b/apps/app_dahdibarge.c
@@ -54,7 +54,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 
 static char *app = "DAHDIBarge";
-static char *deprecated_app = "ZapBarge";
 
 static char *synopsis = "Barge in (monitor) DAHDI channel";
 
@@ -288,12 +287,6 @@ out:
 	return res;
 }
 
-static int conf_exec_warn(struct ast_channel *chan, void *data)
-{
-	ast_log(LOG_WARNING, "Use of the command %s is deprecated, please use %s instead.\n", deprecated_app, app);
-	return conf_exec(chan, data);
-}
-
 static int unload_module(void)
 {
 	return ast_unregister_application(app);
@@ -301,7 +294,6 @@ static int unload_module(void)
 
 static int load_module(void)
 {
-	ast_register_application(deprecated_app, conf_exec_warn, synopsis, descrip);
 	return ((ast_register_application(app, conf_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
 }