Ignore:
Timestamp:
May 17, 2010 1:07:39 PM (10 years ago)
Author:
ming
Message:

Merge #1050, #1052, #1053, #1054 into the main trunk.

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

  • pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

    r3172 r3175  
    1919 */ 
    2020#include <pjsua-lib/pjsua.h> 
     21#include "gui.h" 
    2122 
    2223 
     
    150151static void ring_stop(pjsua_call_id call_id); 
    151152 
    152 pj_bool_t app_restart; 
     153pj_bool_t       app_restart; 
     154pj_log_func     *log_cb = NULL; 
    153155 
    154156/***************************************************************************** 
     
    44954497    app_config.cfg.cb.on_mwi_info = &on_mwi_info; 
    44964498    app_config.cfg.cb.on_transport_state = &on_transport_state; 
     4499    app_config.log_cfg.cb = log_cb; 
    44974500 
    44984501    /* Set sound device latency */ 
Note: See TracChangeset for help on using the changeset viewer.