[asterisk-commits] jrose: branch jrose/bridge_projects r388227 - in /team/jrose/bridge_projects:...

[SVN commits to the Asterisk project]

Author: jrose
Date: Thu May  9 16:52:31 2013
New Revision: 388227

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=388227
Log:
automerge

Modified:
    team/jrose/bridge_projects/   (props changed)
    team/jrose/bridge_projects/apps/app_userevent.c
    team/jrose/bridge_projects/bridges/bridge_builtin_features.c

Propchange: team/jrose/bridge_projects/
------------------------------------------------------------------------------
--- bridge_construction-integrated (original)
+++ bridge_construction-integrated Thu May  9 16:52:31 2013
@@ -1,1 +1,1 @@
-/trunk:1-388114
+/trunk:1-388176

Propchange: team/jrose/bridge_projects/
------------------------------------------------------------------------------
--- bridge_projects-integrated (original)
+++ bridge_projects-integrated Thu May  9 16:52:31 2013
@@ -1,1 +1,1 @@
-/team/group/bridge_construction:1-388165
+/team/group/bridge_construction:1-388226

Modified: team/jrose/bridge_projects/apps/app_userevent.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/apps/app_userevent.c?view=diff&rev=388227&r1=388226&r2=388227
==============================================================================
--- team/jrose/bridge_projects/apps/app_userevent.c (original)
+++ team/jrose/bridge_projects/apps/app_userevent.c Thu May  9 16:52:31 2013
@@ -92,7 +92,7 @@
 		ast_str_append(&body, 0, "%s\r\n", args.extra[x]);
 	}
 
-	blob = ast_json_pack("{s: s, s: s, s: s}",
+	blob = ast_json_pack("{s: s, s: s}",
 			     "eventname", args.eventname,
 			     "body", ast_str_buffer(body));
 	if (!blob) {

Modified: team/jrose/bridge_projects/bridges/bridge_builtin_features.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/bridges/bridge_builtin_features.c?view=diff&rev=388227&r1=388226&r2=388227
==============================================================================
--- team/jrose/bridge_projects/bridges/bridge_builtin_features.c (original)
+++ team/jrose/bridge_projects/bridges/bridge_builtin_features.c Thu May  9 16:52:31 2013
@@ -103,11 +103,6 @@
 	int cause;
 
 	/* Fill the variable with the extension and context we want to call */
-/* BUGBUG if local channel optimization is using masquerades then this needs /n so the destination keeps its DTMF features.
- * Or use /n to keep the peer channel stable until after the atxfer completes and remove the /n from the channel.
- *
- * Local channel optimization currently is disabled because I don't set the chan->bridge pointers.
- */
 	snprintf(destination, sizeof(destination), "%s@%s", exten, context);
 
 	/* Now we request that chan_local prepare to call the destination */