Changeset 3878 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c
- Timestamp:
- Oct 31, 2011 10:31:23 AM (12 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk
- Property svn:mergeinfo changed
/pjproject/branches/1.x merged: 3834,3845-3846,3867-3868,3871,3873
- Property svn:mergeinfo changed
-
pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c
r3864 r3878 896 896 #endif 897 897 898 /* Use of proxy */ 899 if (acc->cfg.reg_use_proxy != cfg->reg_use_proxy) { 900 acc->cfg.reg_use_proxy = cfg->reg_use_proxy; 901 update_reg = PJ_TRUE; 902 } 903 898 904 /* Global outbound proxy */ 899 905 if (global_route_crc != acc->global_route_crc) { … … 1006 1012 acc->cfg.reg_first_retry_interval = cfg->reg_first_retry_interval; 1007 1013 acc->cfg.drop_calls_on_reg_fail = cfg->drop_calls_on_reg_fail; 1014 acc->cfg.register_on_acc_add = cfg->register_on_acc_add; 1008 1015 if (acc->cfg.reg_delay_before_refresh != cfg->reg_delay_before_refresh) { 1009 1016 acc->cfg.reg_delay_before_refresh = cfg->reg_delay_before_refresh; … … 1068 1075 acc->cfg.vid_cap_dev = cfg->vid_cap_dev; 1069 1076 acc->cfg.vid_rend_dev = cfg->vid_rend_dev; 1077 1078 /* Call hold type */ 1079 acc->cfg.call_hold_type = cfg->call_hold_type; 1070 1080 1071 1081 on_return:
Note: See TracChangeset
for help on using the changeset viewer.