Changeset 8683 for branches/gajim_0.11.1/src/common

Timestamp:

08/31/07 19:22:58 (15 months ago)

Author:

asterix

Message:

[misc] repare sending composing chatstates using xep instead of xep. Fix #3241.

Location:

branches/gajim_0.11.1/src/common

Files:

• connection.py (modified) (2 diffs)
• contacts.py (modified) (3 diffs)
• zeroconf/connection_handlers_zeroconf.py (modified) (4 diffs)
• zeroconf/connection_zeroconf.py (modified) (2 diffs)

branches/gajim_0.11.1/src/common/connection.py

@@ -700 +700 @@
 
         def send_message(self, jid, msg, keyID, type = 'chat', subject='',
-        chatstate = None, msg_id = None, composing_jep = None, resource = None,
+        chatstate = None, msg_id = None, composing_xep = None, resource = None,
         user_nick = None, xhtml = None):
                 if not self.connection:
@@ -754 +754 @@
                 # tag is the active event
                 if chatstate is not None:
-                        if (composing_jep == 'JEP-0085' or not composing_jep) and \
-                        composing_jep != 'asked_once':
-                                # JEP-0085
+                        if (composing_xep == 'XEP-0085' or not composing_xep) and \
+                        composing_xep != 'asked_once':
+                                # XEP-0085
                                 msg_iq.setTag(chatstate, namespace = common.xmpp.NS_CHATSTATES)
-                        if composing_jep in ('JEP-0022', 'asked_once') or not composing_jep:
-                                # JEP-0022
+                        if composing_xep in ('XEP-0022', 'asked_once') or not composing_xep:
+                                # XEP-0022
                                 chatstate_node = msg_iq.setTag('x',
                                         namespace = common.xmpp.NS_EVENT)

branches/gajim_0.11.1/src/common/contacts.py

@@ -21 +21 @@
         def __init__(self, jid='', name='', groups=[], show='', status='', sub='',
         ask='', resource='', priority=0, keyID='', our_chatstate=None,
-        chatstate=None, last_status_time=None, msg_id = None, composing_jep = None):
+        chatstate=None, last_status_time=None, msg_id = None, composing_xep = None):
                 self.jid = jid
                 self.name = name
@@ -44 +44 @@
                 self.msg_id = msg_id
                 # tell which JEP we're using for composing state
-                # None = have to ask, JEP-0022 = use this jep,
-                # JEP-0085 = use this jep, False = no composing support
-                self.composing_jep = composing_jep
+                # None = have to ask, XEP-0022 = use this jep,
+                # XEP-0085 = use this jep, False = no composing support
+                self.composing_xep = composing_xep
                 # this is contact's chatstate
                 self.chatstate = chatstate
@@ -145 +145 @@
         def create_contact(self, jid='', name='', groups=[], show='', status='',
                 sub='', ask='', resource='', priority=0, keyID='', our_chatstate=None,
-                chatstate=None, last_status_time=None, composing_jep=None):
+                chatstate=None, last_status_time=None, composing_xep=None):
                 return Contact(jid, name, groups, show, status, sub, ask, resource,
                         priority, keyID, our_chatstate, chatstate, last_status_time,
-                        composing_jep)
+                        composing_xep)
         
         def copy_contact(self, contact):

branches/gajim_0.11.1/src/common/zeroconf/connection_handlers_zeroconf.py

@@ -652 +652 @@
                 delayed = msg.getTag('x', namespace = common.xmpp.NS_DELAY) != None
                 msg_id = None
-                composing_jep = None
+                composing_xep = None
                 xtags = msg.getTags('x')
                 # chatstates - look for chatstate tags in a message if not delayed
                 if not delayed:
-                        composing_jep = False
+                        composing_xep = False
                         children = msg.getChildren()
                         for child in children:
                                 if child.getNamespace() == 'http://jabber.org/protocol/chatstates':
                                         chatstate = child.getName()
-                                        composing_jep = 'JEP-0085'
+                                        composing_xep = 'XEP-0085'
                                         break
                         # No JEP-0085 support, fallback to JEP-0022
@@ -668 +668 @@
                                 if chatstate_child:
                                         chatstate = 'active'
-                                        composing_jep = 'JEP-0022'
+                                        composing_xep = 'XEP-0022'
                                         if not msgtxt and chatstate_child.getTag('composing'):
                                                 chatstate = 'composing'
@@ -704 +704 @@
                                         subject = subject)
                         self.dispatch('MSG', (frm, msgtxt, tim, encrypted, mtype, subject,
-                                chatstate, msg_id, composing_jep, user_nick, msghtml))
+                                chatstate, msg_id, composing_xep, user_nick, msghtml))
                 elif mtype == 'normal': # it's single message
                         if self.name not in no_log_for and jid not in no_log_for and msgtxt:
@@ -711 +711 @@
                         if invite:
                                 self.dispatch('MSG', (frm, msgtxt, tim, encrypted, 'normal',
-                                        subject, chatstate, msg_id, composing_jep, user_nick))
+                                        subject, chatstate, msg_id, composing_xep, user_nick))
         # END messageCB
         

branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py

@@ -346 +346 @@
 
         def send_message(self, jid, msg, keyID, type = 'chat', subject='',
-        chatstate = None, msg_id = None, composing_jep = None, resource = None, 
+        chatstate = None, msg_id = None, composing_xep = None, resource = None, 
         user_nick = None):
                 fjid = jid
@@ -394 +394 @@
                 # tag is the active event
                 if chatstate is not None:
-                        if composing_jep == 'JEP-0085' or not composing_jep:
+                        if composing_xep == 'XEP-0085' or not composing_xep:
                                 # JEP-0085
                                 msg_iq.setTag(chatstate, namespace = common.xmpp.NS_CHATSTATES)
-                        if composing_jep == 'JEP-0022' or not composing_jep:
+                        if composing_xep == 'XEP-0022' or not composing_xep:
                                 # JEP-0022
                                 chatstate_node = msg_iq.setTag('x', namespace = common.xmpp.NS_EVENT)