Merged revisions 174470 via svnmerge from

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

........
  r174470 | tilghman | 2009-02-09 23:39:33 -0600 (Mon, 09 Feb 2009) | 2 lines
  
  Remove the usage of the KeepAlive app, as it no longer exists.
........


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

1 files changed, 3 insertions, 18 deletions

diff --git a/apps/app_stack.c b/apps/app_stack.c
index 37a0fe62b..6f5093e09 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -461,16 +461,14 @@ static int handle_gosub(struct ast_channel *chan, AGI *agi, int argc, char **arg
 		int res;
 
 		ast_debug(1, "Trying gosub with arguments '%s'\n", gosub_args);
-		ast_copy_string(chan->context, "app_stack_gosub_virtual_context", sizeof(chan->context));
-		ast_copy_string(chan->exten, "s", sizeof(chan->exten));
-		chan->priority = 0;
 
 		if ((res = pbx_exec(chan, theapp, gosub_args)) == 0) {
 			struct ast_pbx *pbx = chan->pbx;
+			struct ast_pbx_args args = { .no_hangup_chan = 1 };
 			/* Suppress warning about PBX already existing */
 			chan->pbx = NULL;
 			ast_agi_send(agi->fd, chan, "100 result=0 Trying...\n");
-			ast_pbx_run(chan);
+			ast_pbx_run_args(chan, &args);
 			ast_agi_send(agi->fd, chan, "200 result=0 Gosub complete\n");
 			if (chan->pbx) {
 				ast_free(chan->pbx);
@@ -506,12 +504,7 @@ static int unload_module(void)
 	struct ast_context *con;
 
 	if (ast_agi_unregister) {
-		ast_agi_unregister(ast_module_info->self, &gosub_agi_command);
-
-		if ((con = ast_context_find("app_stack_gosub_virtual_context"))) {
-			ast_context_remove_extension2(con, "s", 1, NULL, 0);
-			ast_context_destroy(con, "app_stack"); /* leave nothing behind */
-		}
+		 ast_agi_unregister(ast_module_info->self, &gosub_agi_command);
 	}
 
 	ast_unregister_application(app_return);
@@ -531,14 +524,6 @@ static int load_module(void)
 	   function is available; if so, use it.
 	*/
 	if (ast_agi_register) {
-		con = ast_context_find_or_create(NULL, NULL, "app_stack_gosub_virtual_context", "app_stack");
-		if (!con) {
-			ast_log(LOG_ERROR, "Virtual context 'app_stack_gosub_virtual_context' does not exist and unable to create\n");
-			return AST_MODULE_LOAD_DECLINE;
-		} else {
-			ast_add_extension2(con, 1, "s", 1, NULL, NULL, "KeepAlive", ast_strdup(""), ast_free_ptr, "app_stack");
-		}
-
 		ast_agi_register(ast_module_info->self, &gosub_agi_command);
 	}