Remove 1.4 changes from UPGRADE.txt, remove deprecated callerid field, remove depreca...
[asterisk/asterisk.git] / main / manager.c
index 543784c..89d6085 100644 (file)
@@ -1430,7 +1430,6 @@ static int action_status(struct mansession *s, struct message *m)
                        "Event: Status\r\n"
                        "Privilege: Call\r\n"
                        "Channel: %s\r\n"
-                       "CallerID: %s\r\n"              /* This parameter is deprecated and will be removed post-1.4 */
                        "CallerIDNum: %s\r\n"
                        "CallerIDName: %s\r\n"
                        "Account: %s\r\n"
@@ -1445,7 +1444,6 @@ static int action_status(struct mansession *s, struct message *m)
                        "\r\n",
                        c->name, 
                        S_OR(c->cid.cid_num, "<unknown>"), 
-                       S_OR(c->cid.cid_num, "<unknown>"), 
                        S_OR(c->cid.cid_name, "<unknown>"), 
                        c->accountcode,
                        ast_state2str(c->_state), c->context,
@@ -1455,7 +1453,6 @@ static int action_status(struct mansession *s, struct message *m)
                        "Event: Status\r\n"
                        "Privilege: Call\r\n"
                        "Channel: %s\r\n"
-                       "CallerID: %s\r\n"              /* This parameter is deprecated and will be removed post-1.4 */
                        "CallerIDNum: %s\r\n"
                        "CallerIDName: %s\r\n"
                        "Account: %s\r\n"
@@ -1466,7 +1463,6 @@ static int action_status(struct mansession *s, struct message *m)
                        "\r\n",
                        c->name, 
                        S_OR(c->cid.cid_num, "<unknown>"), 
-                       S_OR(c->cid.cid_num, "<unknown>"), 
                        S_OR(c->cid.cid_name, "<unknown>"), 
                        c->accountcode,
                        ast_state2str(c->_state), bridge, c->uniqueid, idText);
@@ -1595,13 +1591,11 @@ static void *fast_originate(void *data)
                "Exten: %s\r\n"
                "Reason: %d\r\n"
                "Uniqueid: %s\r\n"
-               "CallerID: %s\r\n"              /* This parameter is deprecated and will be removed post-1.4 */
                "CallerIDNum: %s\r\n"
                "CallerIDName: %s\r\n",
                in->idtext, in->tech, in->data, in->context, in->exten, reason, 
                chan ? chan->uniqueid : "<null>",
                S_OR(in->cid_num, "<unknown>"),
-               S_OR(in->cid_num, "<unknown>"),
                S_OR(in->cid_name, "<unknown>")
                );