[asterisk-commits] kmoore: branch kmoore/stasis-cel_refactoring r388891 - /team/kmoore/stasis-ce...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Wed May 15 15:28:14 2013
New Revision: 388891

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=388891
Log:
Make sure all the parts of the patch are actually committed...

Modified:
    team/kmoore/stasis-cel_refactoring/main/cel.c
    team/kmoore/stasis-cel_refactoring/main/pbx.c

Modified: team/kmoore/stasis-cel_refactoring/main/cel.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-cel_refactoring/main/cel.c?view=diff&rev=388891&r1=388890&r2=388891
==============================================================================
--- team/kmoore/stasis-cel_refactoring/main/cel.c (original)
+++ team/kmoore/stasis-cel_refactoring/main/cel.c Wed May 15 15:28:14 2013
@@ -860,7 +860,7 @@
 	struct ast_channel_snapshot *old_snapshot,
 	struct ast_channel_snapshot *new_snapshot)
 {
-	/* No Newexten event on cache clear */
+	/* No app events on cache clear or creation or if the app doesn't change */
 	if (!new_snapshot || !old_snapshot
 		|| !strcmp(old_snapshot->appl, new_snapshot->appl)) {
 		return;
@@ -868,13 +868,13 @@
 
 	/* old snapshot has an application, end it */
 	if (!ast_strlen_zero(old_snapshot->appl)) {
-		/* AST_CEL_APP_END */
+		report_event_snapshot(old_snapshot, AST_CEL_APP_END, NULL, NULL);
 		return;
 	}
 
 	/* new snapshot has an application, start it */
-	if (!ast_strlen_zero(old_snapshot->appl)) {
-		/* AST_CEL_APP_START */
+	if (!ast_strlen_zero(new_snapshot->appl)) {
+		report_event_snapshot(new_snapshot, AST_CEL_APP_START, NULL, NULL);
 		return;
 	}
 }

Modified: team/kmoore/stasis-cel_refactoring/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-cel_refactoring/main/pbx.c?view=diff&rev=388891&r1=388890&r2=388891
==============================================================================
--- team/kmoore/stasis-cel_refactoring/main/pbx.c (original)
+++ team/kmoore/stasis-cel_refactoring/main/pbx.c Wed May 15 15:28:14 2013
@@ -1573,14 +1573,12 @@
 
 	ast_channel_appl_set(c, app->name);
 	ast_channel_data_set(c, data);
-	ast_cel_report_event(c, AST_CEL_APP_START, NULL, NULL, NULL);
 
 	if (app->module)
 		u = __ast_module_user_add(app->module, c);
 	res = app->execute(c, S_OR(data, ""));
 	if (app->module && u)
 		__ast_module_user_remove(app->module, u);
-	ast_cel_report_event(c, AST_CEL_APP_END, NULL, NULL, NULL);
 	/* restore channel values */
 	ast_channel_appl_set(c, saved_c_appl);
 	ast_channel_data_set(c, saved_c_data);