[asterisk-commits] dlee: branch dlee/stasis-http r382701 - in /team/dlee/stasis-http: ./ apps/

[SVN commits to the Asterisk project]

Author: dlee
Date: Fri Mar  8 09:41:56 2013
New Revision: 382701

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382701
Log:
Merged revisions 382700 from http://svn.asterisk.org/svn/asterisk/team/dlee/stasis-app

Modified:
    team/dlee/stasis-http/   (props changed)
    team/dlee/stasis-http/apps/app_stasis.c

Propchange: team/dlee/stasis-http/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Mar  8 09:41:56 2013
@@ -1,2 +1,1 @@
-/trunk:1-382685
-/team/dlee/stasis-app:1-382698
+/team/dlee/stasis-app:1-382700 /trunk:1-382685

Modified: team/dlee/stasis-http/apps/app_stasis.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-http/apps/app_stasis.c?view=diff&rev=382701&r1=382700&r2=382701
==============================================================================
--- team/dlee/stasis-http/apps/app_stasis.c (original)
+++ team/dlee/stasis-http/apps/app_stasis.c Fri Mar  8 09:41:56 2013
@@ -396,7 +396,7 @@
 		ao2_link(controls, control);
 	}
 
-	subscription = stasis_subscribe(ast_channel_events(chan), sub_handler, app);
+	subscription = stasis_subscribe(ast_channel_topic(chan), sub_handler, app);
 	if (subscription == NULL) {
 		ast_log(LOG_ERROR, "Error subscribing app %s to channel %s\n", args.app_name, ast_channel_name(chan));
 		return -1;