[asterisk-commits] tilghman: branch 1.6.1 r174471 - in /branches/1.6.1: ./ apps/app_stack.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Feb  9 23:42:52 2009
New Revision: 174471

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=174471
Log:
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.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_stack.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_stack.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/apps/app_stack.c?view=diff&rev=174471&r1=174470&r2=174471
==============================================================================
--- branches/1.6.1/apps/app_stack.c (original)
+++ branches/1.6.1/apps/app_stack.c Mon Feb  9 23:42:52 2009
@@ -461,16 +461,14 @@
 		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 @@
 	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 @@
 	   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);
 	}