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

Timestamp:

Jul 10, 2008 8:45:03 PM (16 years ago)

Author:

bennylp

Message:

Ticket 555: modifications to pjsua instant messaging callbacks

File:

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

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

@@ -192 +192 @@
         }
 
+        if (pjsua_var.ua_cfg.cb.on_typing2) {
+            pjsua_acc_id acc_id;
+
+            if (call_id == PJSUA_INVALID_ID) {
+                acc_id = pjsua_acc_find_for_incoming(rdata);
+            } else {
+                pjsua_call *call = &pjsua_var.calls[call_id];
+                acc_id = call->acc_id;
+            }
+
+
+            (*pjsua_var.ua_cfg.cb.on_typing2)(call_id, from, to, &contact,
+                                              is_typing, rdata, acc_id);
+        }
+
     } else {
         pj_str_t mime_type;
@@ -220 +235 @@
 
         if (pjsua_var.ua_cfg.cb.on_pager2) {
+            pjsua_acc_id acc_id;
+
+            if (call_id == PJSUA_INVALID_ID) {
+                acc_id = pjsua_acc_find_for_incoming(rdata);
+            } else {
+                pjsua_call *call = &pjsua_var.calls[call_id];
+                acc_id = call->acc_id;
+            }
+
             (*pjsua_var.ua_cfg.cb.on_pager2)(call_id, from, to, &contact, 
-                                             &mime_type, &text_body, rdata);
+                                             &mime_type, &text_body, rdata,
+                                             acc_id);
         }
     }
@@ -390 +415 @@
                                                  &tsx->status_text,
                                                  tsx->last_tx,
-                                                 rdata);
+                                                 rdata, im_data->acc_id);
         }
     }