Changeset 2374

Timestamp:

Dec 11, 2008 11:03:21 AM (15 years ago)

Author:

bennylp

Message:

Ticket #681: Bugs in sending and receiving instant messages in Python wrapper (thanks Johan Risberg for the patches)

Location:

pjproject/trunk/pjsip-apps/src/python

Files:

• _pjsua.c (modified) (2 diffs)
• pjsua.py (modified) (5 diffs)

pjproject/trunk/pjsip-apps/src/python/_pjsua.c

@@ -2138 +2138 @@
     content = PyString_ToPJ(pContent);
 
+    pjsua_msg_data_init(&msg_data);
+
     if (pMsgData != Py_None) {
         PyObj_pjsua_msg_data *omd;
@@ -2179 +2181 @@
         
     to = PyString_ToPJ(pTo);
+
+    pjsua_msg_data_init(&msg_data);
 
     if (pMsgData != Py_None) {

pjproject/trunk/pjsip-apps/src/python/pjsua.py

@@ -1673 +1673 @@
         self._lib()._err_check("send_request()", self, err)
 
-
+    def send_pager(self, text, im_id=0, content_type="text/plain", 
+                   hdr_list=None):
+        """Send instant message inside a call.
+
+        Keyword arguments:
+        text         -- Instant message to be sent
+        im_id        -- Optional instant message ID to identify this
+                        instant message when delivery status callback
+                        is called.
+        content_type -- MIME type identifying the instant message
+        hdr_list     -- Optional list of headers to be sent with the
+                        request.
+
+        """
+        lck = self._lib().auto_lock()
+        err = _pjsua.call_send_im(self._id, \
+                             content_type, text, \
+                             Lib._create_msg_data(hdr_list), \
+                             im_id)
+        self._lib()._err_check("send_pager()", self, err)
+
+  
 class BuddyInfo:
     """This class contains information about Buddy. Application may 
@@ -2085 +2106 @@
                 self.handle_events(5)
                 loop = loop + 1
-                time.sleep(0.050)
+                time.sleep(0.050)
         _pjsua.destroy()
         _lib = None
@@ -2665 +2686 @@
                      body, acc_id):
         call = None
-        if call_id == -1:
+        if call_id != -1:
             call = self._lookup_call(call_id)
         if call:
@@ -2680 +2701 @@
                             code, reason, acc_id):
         call = None
-        if call_id == -1:
+        if call_id != -1:
             call = self._lookup_call(call_id)
         if call:
@@ -2695 +2716 @@
                       acc_id):
         call = None
-        if call_id == -1:
+        if call_id != -1:
             call = self._lookup_call(call_id)
         if call: