Changeset 10144

Timestamp:

08/07/08 17:27:02 (4 months ago)

Author:

roidelapluie

Message:

Don't print twice "ping? pong" when using /ping command in a pm.

Files:

• trunk/src/gajim.py (modified) (3 diffs)

trunk/src/gajim.py

@@ -1871 +1871 @@
 
         def handle_event_ping_sent(self, account, contact):
-                for jid in [contact.jid, contact.get_full_jid()]:
+                if contact.jid == contact.get_full_jid():
+                        # If contact is a groupchat user
+                        jids = [contact.jid]
+                else:
+                        jids = [contact.jid, contact.get_full_jid()]            
+                for jid in jids:
                         ctrl = self.msg_win_mgr.get_control(jid, account)
                         if ctrl:
@@ -1879 +1884 @@
                 contact = data[0]
                 seconds = data[1]
-
-                for jid in [contact.jid, contact.get_full_jid()]:
+                if contact.jid == contact.get_full_jid():
+                        # If contact is a groupchat user
+                        jids = [contact.jid]
+                else:
+                        jids = [contact.jid, contact.get_full_jid()]
+                for jid in jids:
                         ctrl = self.msg_win_mgr.get_control(jid, account)
                         if ctrl:
@@ -1886 +1895 @@
 
         def handle_event_ping_error(self, account, contact):
-                for jid in [contact.jid, contact.get_full_jid()]:
+                if contact.jid == contact.get_full_jid():
+                        # If contact is a groupchat user
+                        jids = [contact.jid]
+                else:
+                        jids = [contact.jid, contact.get_full_jid()]
+                for jid in jids:
                         ctrl = self.msg_win_mgr.get_control(jid, account)
                         if ctrl: