1
0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-18 09:32:34 +00:00

remove depricated vars causing issues

This commit is contained in:
Anthony Minessale 2013-04-02 21:12:14 -05:00
parent b2f0f9b88a
commit 6af46c3d60

@ -853,8 +853,6 @@ void sofia_update_callee_id(switch_core_session_t *session, sofia_profile_t *pro
int fs = 0, lazy = 0, att = 0;
const char *name_var = "callee_id_name";
const char *num_var = "callee_id_number";
const char *ename_var = "effective_callee_id_name";
const char *enum_var = "effective_callee_id_number";
if (switch_true(switch_channel_get_variable(channel, SWITCH_IGNORE_DISPLAY_UPDATES_VARIABLE))) {
return;
@ -864,8 +862,6 @@ void sofia_update_callee_id(switch_core_session_t *session, sofia_profile_t *pro
if (switch_channel_inbound_display(channel)) {
name_var = "caller_id_name";
num_var = "caller_id_number";
ename_var = "effective_caller_id_name";
enum_var = "effective_caller_id_number";
}
@ -917,15 +913,6 @@ void sofia_update_callee_id(switch_core_session_t *session, sofia_profile_t *pro
}
}
if (((tmp = switch_channel_get_variable(channel, ename_var)) ||
(tmp = switch_channel_get_variable(channel, "sip_callee_id_name"))) && !zstr(tmp)) {
name = (char *) tmp;
}
if (((tmp = switch_channel_get_variable(channel, enum_var)) ||
(tmp = switch_channel_get_variable(channel, "sip_callee_id_number"))) && !zstr(tmp)) {
number = tmp;
}
if (zstr(number)) {
if ((tmp = switch_channel_get_variable(channel, num_var)) && !zstr(tmp)) {