Changeset 3175 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

May 17, 2010 1:07:39 PM (14 years ago)

Author:

ming

Message:

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

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (3 diffs)

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

@@ -19 +19 @@
  */
 #include <pjsua-lib/pjsua.h>
+#include "gui.h"
 
 
@@ -150 +151 @@
 static void ring_stop(pjsua_call_id call_id);
 
-pj_bool_t app_restart;
+pj_bool_t       app_restart;
+pj_log_func     *log_cb = NULL;
 
 /*****************************************************************************
@@ -4495 +4497 @@
     app_config.cfg.cb.on_mwi_info = &on_mwi_info;
     app_config.cfg.cb.on_transport_state = &on_transport_state;
+    app_config.log_cfg.cb = log_cb;
 
     /* Set sound device latency */