[asterisk-commits] rmudgett: trunk r350454 - in /trunk: ./ main/cel.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Jan 11 16:53:09 2012
New Revision: 350454

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=350454
Log:
Remove extraneous BRIDGEPEER AMI VarSet event on a CEL dummy channel.

(closes issue ASTERISK-19180)
Reported by: Corey Farrell
Patches:
      asterisk_cel_noevent_varset.diff (license #5909) patch uploaded by Corey Farrell
........

Merged revisions 350452 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 350453 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/main/cel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/main/cel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/cel.c?view=diff&rev=350454&r1=350453&r2=350454
==============================================================================
--- trunk/main/cel.c (original)
+++ trunk/main/cel.c Wed Jan 11 16:53:09 2012
@@ -462,7 +462,9 @@
 	ast_string_field_set(tchan, peeraccount, record.peer_account);
 	ast_string_field_set(tchan, userfield, record.user_field);
 
-	pbx_builtin_setvar_helper(tchan, "BRIDGEPEER", record.peer);
+	if ((newvariable = ast_var_assign("BRIDGEPEER", record.peer))) {
+		AST_LIST_INSERT_HEAD(headp, newvariable, entries);
+	}
 
 	tchan->appl = ast_strdup(record.application_name);
 	tchan->data = ast_strdup(record.application_data);