Changeset 476 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_im.c

Timestamp:

May 26, 2006 12:17:46 PM (18 years ago)

Author:

bennylp

Message:

First stage in pjsua library re-arrangements towards creating an easy to use high level API

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_im.c (modified) (7 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_im.c

@@ -153 +153 @@
         text.slen = rdata->msg_info.msg->body->len;
 
-        pjsua_ui_on_pager(call_index, from, to, &text);
+        if (pjsua.cb.on_pager)
+            (*pjsua.cb.on_pager)(call_index, from, to, &text);
 
     } else {
@@ -170 +171 @@
         }
 
-        pjsua_ui_on_typing(call_index, from, to, is_typing);
+        if (pjsua.cb.on_typing)
+            (*pjsua.cb.on_typing)(call_index, from, to, is_typing);
     }
 
@@ -270 +272 @@
  * Send IM outside dialog.
  */
-pj_status_t pjsua_im_send(int acc_index, const char *dst_uri, 
-                          const char *str)
+PJ_DEF(pj_status_t) pjsua_im_send(int acc_index, const char *dst_uri, 
+                                  const char *str)
 {
     pjsip_tx_data *tdata;
@@ -282 +284 @@
 
     /* Create request. */
-    status = pjsip_endpt_create_request( pjsua.endpt, &pjsip_message_method,
-                                         &dst, &pjsua.acc[acc_index].local_uri,
-                                         &dst, NULL, NULL, -1, NULL, &tdata);
+    status = pjsip_endpt_create_request(pjsua.endpt, &pjsip_message_method,
+                                        &dst, 
+                                        &pjsua.config.acc_config[acc_index].id,
+                                        &dst, NULL, NULL, -1, NULL, &tdata);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to create request", status);
@@ -296 +299 @@
     /* Add contact. */
     pjsip_msg_add_hdr( tdata->msg, (pjsip_hdr*)
-                       pjsip_generic_string_hdr_create(tdata->pool, 
-                                                       &STR_CONTACT,
-                                                       &pjsua.acc[acc_index].contact_uri));
+        pjsip_generic_string_hdr_create(tdata->pool, 
+                                        &STR_CONTACT,
+                                        &pjsua.config.acc_config[acc_index].contact));
 
     /* Duplicate text.
@@ -331 +334 @@
  * Send typing indication outside dialog.
  */
-pj_status_t pjsua_im_typing(int acc_index, const char *dst_uri, 
-                            pj_bool_t is_typing)
+PJ_DEF(pj_status_t) pjsua_im_typing(int acc_index, const char *dst_uri, 
+                                    pj_bool_t is_typing)
 {
     const pj_str_t dst = pj_str((char*)dst_uri);
@@ -340 +343 @@
     /* Create request. */
     status = pjsip_endpt_create_request( pjsua.endpt, &pjsip_message_method,
-                                         &dst, &pjsua.acc[acc_index].local_uri,
+                                         &dst, 
+                                         &pjsua.config.acc_config[acc_index].id,
                                          &dst, NULL, NULL, -1, NULL, &tdata);
     if (status != PJ_SUCCESS) {