[asterisk-commits] kmoore: branch kmoore/stasis-channel_events r384088 - /team/kmoore/stasis-cha...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Wed Mar 27 12:55:58 2013
New Revision: 384088

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=384088
Log:
Tweak ordering of AMI event items

Modified:
    team/kmoore/stasis-channel_events/main/manager_channels.c

Modified: team/kmoore/stasis-channel_events/main/manager_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-channel_events/main/manager_channels.c?view=diff&rev=384088&r1=384087&r2=384088
==============================================================================
--- team/kmoore/stasis-channel_events/main/manager_channels.c (original)
+++ team/kmoore/stasis-channel_events/main/manager_channels.c Wed Mar 27 12:55:58 2013
@@ -481,8 +481,8 @@
 	manager_event(manager_flag, ast_channel_blob_type(obj),
 		      "%s"
 		      "%s",
-		      ast_str_buffer(channel_event_string),
-		      ast_str_buffer(blob_str));
+		      ast_str_buffer(blob_str),
+		      ast_str_buffer(channel_event_string));
 }
 
 static int userevent_exclusion_cb(const char *key)
@@ -524,10 +524,10 @@
 		</managerEventInstance>
 	***/
 	manager_event(EVENT_FLAG_USER, "UserEvent",
+		      "UserEvent: %s\r\n"
 		      "%s"
-		      "UserEvent: %s\r\n"
 		      "%s",
-		      ast_str_buffer(channel_event_string), eventname, ast_str_buffer(body));
+		      eventname, ast_str_buffer(body), ast_str_buffer(channel_event_string));
 }
 
 static void channel_hangup_request(struct ast_channel_blob *obj, int manager_flag)
@@ -562,9 +562,10 @@
 	}
 
 	manager_event(EVENT_FLAG_CALL, manager_event,
-		      "%s%s",
-		      ast_str_buffer(channel_event_string),
-		      ast_str_buffer(extra));
+		      "%s"
+		      "%s",
+		      ast_str_buffer(extra),
+		      ast_str_buffer(channel_event_string));
 }
 
 static void channel_newexten(struct ast_channel_blob *obj, int manager_flag)
@@ -583,8 +584,8 @@
 		"%s"
 		"%s"
 		"Extension: %s\r\n",
+		ast_str_buffer(blob_str),
 		ast_str_buffer(channel_event_string),
-		ast_str_buffer(blob_str),
 		obj->snapshot->exten);
 }