Make event parameter names consistent for callerid (bug #3116)
authorMark Spencer <markster@digium.com>
Tue, 21 Dec 2004 21:46:58 +0000 (21:46 +0000)
committerMark Spencer <markster@digium.com>
Tue, 21 Dec 2004 21:46:58 +0000 (21:46 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4518 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channel.c

index c26774f..d572035 100755 (executable)
--- a/channel.c
+++ b/channel.c
@@ -1907,8 +1907,8 @@ struct ast_channel *ast_request(const char *type, int format, void *data, int *c
                                        manager_event(EVENT_FLAG_CALL, "Newchannel",
                                        "Channel: %s\r\n"
                                        "State: %s\r\n"
                                        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);
                                }
                                        "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 @@ void ast_set_callerid(struct ast_channel *chan, const char *callerid, const char
                ast_cdr_setcid(chan->cdr, chan);
        manager_event(EVENT_FLAG_CALL, "Newcallerid", 
                                "Channel: %s\r\n"
                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>",
                                "Uniqueid: %s\r\n",
                                chan->name, chan->cid.cid_num ? 
                                chan->cid.cid_num : "<Unknown>",
@@ -2467,8 +2467,8 @@ int ast_setstate(struct ast_channel *chan, int state)
                        manager_event(EVENT_FLAG_CALL, "Newchannel",
                        "Channel: %s\r\n"
                        "State: %s\r\n"
                        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>", 
                        "Uniqueid: %s\r\n",
                        chan->name, ast_state2str(chan->_state), 
                        chan->cid.cid_num ? chan->cid.cid_num : "<unknown>", 
@@ -2478,8 +2478,8 @@ int ast_setstate(struct ast_channel *chan, int state)
                        manager_event(EVENT_FLAG_CALL, "Newstate", 
                                "Channel: %s\r\n"
                                "State: %s\r\n"
                        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>", 
                                "Uniqueid: %s\r\n",
                                chan->name, ast_state2str(chan->_state), 
                                chan->cid.cid_num ? chan->cid.cid_num : "<unknown>",