[Asterisk-cvs] asterisk channel.c,1.151,1.152

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv20141

Modified Files:
	channel.c 
Log Message:
Make event parameter names consistent for callerid (bug #3116)


Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- channel.c	18 Dec 2004 22:04:06 -0000	1.151
+++ channel.c	21 Dec 2004 21:46:58 -0000	1.152
@@ -1907,8 +1907,8 @@
 					manager_event(EVENT_FLAG_CALL, "Newchannel",
 					"Channel: %s\r\n"
 					"State: %s\r\n"
-					"Callerid: %s\r\n"
-					"CalleridName: %s\r\n"
+					"CallerID: %s\r\n"
+					"CallerIDName: %s\r\n"
 					"Uniqueid: %s\r\n",
 					c->name, ast_state2str(c->_state), c->cid.cid_num ? c->cid.cid_num : "<unknown>", c->cid.cid_name ? c->cid.cid_name : "<unknown>",c->uniqueid);
 				}
@@ -2447,8 +2447,8 @@
 		ast_cdr_setcid(chan->cdr, chan);
 	manager_event(EVENT_FLAG_CALL, "Newcallerid", 
 				"Channel: %s\r\n"
-				"Callerid: %s\r\n"
-				"CalleridName: %s\r\n"
+				"CallerID: %s\r\n"
+				"CallerIDName: %s\r\n"
 				"Uniqueid: %s\r\n",
 				chan->name, chan->cid.cid_num ? 
 				chan->cid.cid_num : "<Unknown>",
@@ -2467,8 +2467,8 @@
 			manager_event(EVENT_FLAG_CALL, "Newchannel",
 			"Channel: %s\r\n"
 			"State: %s\r\n"
-			"Callerid: %s\r\n"
-			"CalleridName: %s\r\n"
+			"CallerID: %s\r\n"
+			"CallerIDName: %s\r\n"
 			"Uniqueid: %s\r\n",
 			chan->name, ast_state2str(chan->_state), 
 			chan->cid.cid_num ? chan->cid.cid_num : "<unknown>", 
@@ -2478,8 +2478,8 @@
 			manager_event(EVENT_FLAG_CALL, "Newstate", 
 				"Channel: %s\r\n"
 				"State: %s\r\n"
-				"Callerid: %s\r\n"
-				"CalleridName: %s\r\n"
+				"CallerID: %s\r\n"
+				"CallerIDName: %s\r\n"
 				"Uniqueid: %s\r\n",
 				chan->name, ast_state2str(chan->_state), 
 				chan->cid.cid_num ? chan->cid.cid_num : "<unknown>",