Changeset 4677 for pjproject/branches/projects/pjsua2/pjsip-apps/src/pygui/account.py

Timestamp:

Dec 4, 2013 12:19:48 PM (10 years ago)

Author:

nanang

Message:

Re #1708: Implement adding participants, also various misc updates/fixes.

File:

• pjproject/branches/projects/pjsua2/pjsip-apps/src/pygui/account.py (modified) (4 diffs)

pjproject/branches/projects/pjsua2/pjsip-apps/src/pygui/account.py

@@ -69 +69 @@
         
         def newChat(self, buddy):
-                chat = ch.Chat(self, buddy)
+                chat = ch.Chat(self.app, self, buddy)
                 self.chatList.append(chat)
                 return chat
@@ -109 +109 @@
                 ci = c.getInfo()
                 msg = "Incoming call for account '%s'" % self.cfg.idUri
-                if msgbox.askquestion(msg, "Accept call from '%s'?" % (ci.remoteURI), default=msgbox.YES) == u'yes':
+                if msgbox.askquestion(msg, "Accept call from '%s'?" % (ci.remoteUri), default=msgbox.YES) == u'yes':
                         call_prm.statusCode = 200
                         c.answer(call_prm)
                         
                         # create chat instance
-                        bud = self.findBuddy(ci.remoteURI)
-                        if not bud: return
+                        bud = self.findBuddy(ci.remoteUri)
+                        if not bud:
+                                print "=== Incoming call from '%s': cannot find buddy" % ci.remoteUri
+                                return
                         chat = self.findChat(bud)
-                        if not chat: chat = self.newChat(bud, c)
-                        
+                        if not chat: chat = self.newChat(bud)
+                        
+                        chat.showWindow()
                         chat.registerCall(bud, c)
-                        chat.showWindow()
+                        chat.updateCallState(c, ci)
                 else:
                         c.hangup(call_prm)
@@ -126 +129 @@
         def onInstantMessage(self, prm):
                 bud = self.findBuddy(prm.fromUri)
-                if not bud: return
+                if not bud:
+                        print "=== Incoming IM from '%s': cannot find buddy" % prm.fromUri
+                        return
                 chat = self.findChat(bud)
                 if not chat: chat = self.newChat(bud)
                         
+                chat.showWindow()
                 chat.addMessage(bud.cfg.uri, prm.msgBody)
-                chat.showWindow()
                 
         def onInstantMessageStatus(self, prm):
@@ -145 +150 @@
         def onTypingIndication(self, prm):
                 bud = self.findBuddy(prm.fromUri)
-                if not bud: return
+                if not bud:
+                        print "=== Incoming typing indication from '%s': cannot find buddy" % prm.fromUri
+                        return
                 chat = self.findChat(bud)
                 if not chat: return