[asterisk-commits] dlee: branch dlee/ASTERISK-21096 r383337 - in /team/dlee/ASTERISK-21096: ./ m...

[SVN commits to the Asterisk project]

Author: dlee
Date: Mon Mar 18 17:19:37 2013
New Revision: 383337

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=383337
Log:
Merged revisions 383330-383334 from http://svn.asterisk.org/svn/asterisk/team/dlee/json_main

Modified:
    team/dlee/ASTERISK-21096/   (props changed)
    team/dlee/ASTERISK-21096/CHANGES
    team/dlee/ASTERISK-21096/main/manager_channels.c

Propchange: team/dlee/ASTERISK-21096/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar 18 17:19:37 2013
@@ -1,1 +1,1 @@
-/team/dlee/json_main:1-383327 /trunk:1-383315
+/team/dlee/json_main:1-383336 /trunk:1-383315

Modified: team/dlee/ASTERISK-21096/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-21096/CHANGES?view=diff&rev=383337&r1=383336&r2=383337
==============================================================================
--- team/dlee/ASTERISK-21096/CHANGES (original)
+++ team/dlee/ASTERISK-21096/CHANGES Mon Mar 18 17:19:37 2013
@@ -44,8 +44,8 @@
  * Channel related events now contain a snapshot of channel state, adding new
    fields to many of these events.
 
- * The AMI event 'Newchannel' field 'Exten' is deprecated, and may be removed in
-   a future release. Please use the common 'Extension' field instead.
+ * The AMI event 'Newexten' field 'Extension' is deprecated, and may be removed
+   in a future release. Please use the common 'Exten' field instead.
 
  * The AMI event 'UserEvent' from app_userevent now contains the channel state
    fields. The channel state fields will come before the body fields.

Modified: team/dlee/ASTERISK-21096/main/manager_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-21096/main/manager_channels.c?view=diff&rev=383337&r1=383336&r2=383337
==============================================================================
--- team/dlee/ASTERISK-21096/main/manager_channels.c (original)
+++ team/dlee/ASTERISK-21096/main/manager_channels.c Mon Mar 18 17:19:37 2013
@@ -185,8 +185,19 @@
 {
 	RAII_VAR(struct ast_str *, channel_event_string, NULL, ast_free);
 
+	if (ast_strlen_zero(snapshot->appl)) {
+		/* Channel's not in a valid state for a Newexten event yet */
+		return;
+	}
+
+	channel_event_string = manager_build_channel_state_string(snapshot);
+
+	if (!channel_event_string) {
+		return;
+	}
+
+	/* DEPRECATED: Extension field deprecated in 12; remove in 14 */
 	/*** DOCUMENTATION
-	<managerEvent language="en_US" name="Newexten">
 		<managerEventInstance>
 			<synopsis>Raised when a channel enters a new context, extension, priority.</synopsis>
 			<syntax>
@@ -204,20 +215,7 @@
 				</parameter>
 			</syntax>
 		</managerEventInstance>
-	</managerEvent>
 	***/
-	if (ast_strlen_zero(snapshot->appl)) {
-		/* Channel's not in a valid state for a Newexten event yet */
-		return;
-	}
-
-	channel_event_string = manager_build_channel_state_string(snapshot);
-
-	if (!channel_event_string) {
-		return;
-	}
-
-	/* DEPRECATED: Extension field deprecated in 12; remove in 14 */
 	manager_event(EVENT_FLAG_DIALPLAN, "Newexten",
 		      "%s"
 		      "Extension: %s\r\n"
@@ -391,10 +389,12 @@
 	/*** DOCUMENTATION
 		<managerEventInstance>
 			<synopsis>A user defined event raised from the dialplan.</synopsis>
-			<xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" />
-			<parameter name="UserEvent">
-				<para>The event name, as specified in the dialplan.</para>
-			</parameter>
+			<syntax>
+				<xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" />
+				<parameter name="UserEvent">
+					<para>The event name, as specified in the dialplan.</para>
+				</parameter>
+			</syntax>
 			<see-also>
 				<ref type="application">UserEvent</ref>
 			</see-also>