Changeset 3352 for pjproject/trunk


Ignore:
Timestamp:
Oct 21, 2010 2:22:41 AM (14 years ago)
Author:
bennylp
Message:

Misc (re #1134): fixed compilation error in python module due to last change in session timer field from require_timer to use_timer. Thanks Beau Gunderson for the patch!

Location:
pjproject/trunk/pjsip-apps/src/python
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip-apps/src/python/_pjsua.c

    r3010 r3352  
    21842184 
    21852185    status = pjsua_im_send(acc_id, &to, mime_type, &content,  
    2186                            &msg_data, (void *)user_data); 
     2186                           &msg_data, (void*)(long)user_data); 
    21872187    if (pool) 
    21882188        pj_pool_release(pool); 
     
    37113711     
    37123712    status = pjsua_call_send_im(call_id, mime_type, &content,  
    3713                                 &msg_data, (void *)user_data); 
     3713                                &msg_data, (void*)(long)user_data); 
    37143714 
    37153715    if (pool) 
  • pjproject/trunk/pjsip-apps/src/python/_pjsua.h

    r3007 r3352  
    16671667    PyObject        *contact_uri_params; 
    16681668    int              require_100rel; 
    1669     int              require_timer; 
     1669    int              use_timer; 
    16701670    unsigned         timer_se; 
    16711671    unsigned         timer_min_se; 
     
    17451745    obj->contact_uri_params = PyString_FromPJ(&cfg->contact_uri_params); 
    17461746    obj->require_100rel = cfg->require_100rel; 
    1747     obj->require_timer = cfg->require_timer; 
     1747    obj->use_timer = cfg->use_timer; 
    17481748    obj->timer_se = cfg->timer_setting.sess_expires; 
    17491749    obj->timer_min_se = cfg->timer_setting.min_se; 
     
    17951795    cfg->contact_uri_params = PyString_ToPJ(obj->contact_uri_params); 
    17961796    cfg->require_100rel = obj->require_100rel; 
    1797     cfg->require_timer = obj->require_timer; 
     1797    cfg->use_timer = obj->use_timer; 
    17981798    cfg->timer_setting.sess_expires = obj->timer_se; 
    17991799    cfg->timer_setting.min_se = obj->timer_min_se; 
     
    19481948    }, 
    19491949    { 
    1950         "require_timer", T_INT, 
    1951         offsetof(PyObj_pjsua_acc_config, require_timer), 0, 
    1952         "Require session timer." 
     1950        "use_timer", T_INT, 
     1951        offsetof(PyObj_pjsua_acc_config, use_timer), 0, 
     1952        "Use SIP session timers? (default=1)" 
     1953        "0:inactive, 1:optional, 2:mandatory, 3:always" 
    19531954    }, 
    19541955    { 
Note: See TracChangeset for help on using the changeset viewer.