]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
remove depricated vars causing issues
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 3 Apr 2013 02:12:14 +0000 (21:12 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Wed, 3 Apr 2013 02:26:24 +0000 (21:26 -0500)
src/mod/endpoints/mod_sofia/sofia.c

index 1a647c6bfb46fc348543a7d3f8b86db23c97a1f9..b1a6f00ae2540aea29fb9fe17b2c6c5328b0e9cc 100644 (file)
@@ -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)) {