automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@9627 f38db490-d61c-443f-a65b-d21fe96a405b

5 files changed, 5 insertions, 1 deletions

diff --git a/apps/app_page.c b/apps/app_page.c
index 39a0eb4bc..7826d285b 100644
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -85,7 +85,7 @@ static void *page_thread(void *data)
 {
 	struct calloutdata *cd = data;
 	ast_pbx_outgoing_app(cd->tech, AST_FORMAT_SLINEAR, cd->resource, 30000,
-		"MeetMe", cd->meetmeopts, NULL, 0, cd->cidnum, cd->cidname, cd->variables, NULL);
+		"MeetMe", cd->meetmeopts, NULL, 0, cd->cidnum, cd->cidname, cd->variables, NULL, NULL);
 	free(cd);
 	return NULL;
 }
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 7fb8fdd88..d7dbd66f3 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -9506,6 +9506,7 @@ static int __unload_module(void)
 	ast_channel_unregister(&iax2_tech);
 	delete_users();
 	iax_provision_unload();
+	sched_context_destroy(sched);
 	return 0;
 }
 
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index d3b68e226..7538fd9d7 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -4388,6 +4388,7 @@ int unload_module()
 	ast_cli_unregister(&cli_debug);
 	ast_cli_unregister(&cli_no_debug);
 	ast_cli_unregister(&cli_mgcp_reload);
+	sched_context_destroy(sched);
 
 	return 0;
 }
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 74b889b9e..95f58015c 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13381,6 +13381,7 @@ int unload_module()
 	clear_realm_authentication(authl);
 	clear_sip_domains();
 	close(sipsock);
+	sched_context_destroy(sched);
 		
 	return 0;
 }
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index b978d28a6..8f0457296 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -4726,6 +4726,7 @@ int unload_module(void)
 	ast_unregister_switch(&dundi_switch);
 	ast_custom_function_unregister(&dundi_function);
 	res = ast_unregister_application(app);
+	sched_context_destroy(sched);
 	return res;
 }