Changeset 8683

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

Files:

• chat_control.py (modified) (11 diffs)
• common/connection.py (modified) (2 diffs)
• common/contacts.py (modified) (3 diffs)
• common/zeroconf/connection_handlers_zeroconf.py (modified) (4 diffs)
• common/zeroconf/connection_zeroconf.py (modified) (2 diffs)
• gajim.py (modified) (4 diffs)
• message_control.py (modified) (2 diffs)

branches/gajim_0.11.1/src/chat_control.py

@@ -511 +511 @@
 
         def send_message(self, message, keyID = '', type = 'chat', chatstate = None,
-        msg_id = None, composing_jep = None, resource = None):
+        msg_id = None, composing_xep = None, resource = None):
                 '''Send the given message to the active tab. Doesn't return None if error
                 '''
@@ -521 +521 @@
                         ret = MessageControl.send_message(self, message, keyID, type = type,
                                 chatstate = chatstate, msg_id = msg_id,
-                                composing_jep = composing_jep, resource = resource,
+                                composing_xep = composing_xep, resource = resource,
                                 user_nick = self.user_nick)
                         if ret:
@@ -1084 +1084 @@
                         if contact.show == 'offline':
                                 chatstate = ''
-                        elif contact.composing_jep == 'JEP-0085':
+                        elif contact.composing_xep == 'XEP-0085':
                                 if st == 'all' or cs == 'composing':
                                         chatstate = helpers.get_uf_chatstate(cs)
                                 else:
                                         chatstate = ''
-                        elif contact.composing_jep == 'JEP-0022':
+                        elif contact.composing_xep == 'XEP-0022':
                                 if cs in ('composing', 'paused'):
                                         # only print composing, paused
@@ -1161 +1161 @@
                 chatstates_on = gajim.config.get('outgoing_chat_state_notifications') != \
                         'disabled'
-                composing_jep = contact.composing_jep
+                composing_xep = contact.composing_xep
                 chatstate_to_send = None
                 if chatstates_on and contact is not None:
-                        if composing_jep is None:
+                        if composing_xep is None:
                                 # no info about peer
                                 # send active to discover chat state capabilities
@@ -1170 +1170 @@
                                 # because we want it sent with REAL message
                                 # (not standlone) eg. one that has body
-                                
-                                #FIXME:
-                                # Enable 3 next lines after 0.11 release.
-                                # Having this disabled violate xep85 5.1.2 but then we don't break
-                                # notifications between 0.10.1 and 0.11 See #2637
-                                # if contact.our_chatstate:
-                                #       # We already ask for xep 85, don't ask it twice
-                                #       composing_jep = 'asked_once'
+
+                                if contact.our_chatstate:
+                                        # We already asked for xep 85, don't ask it twice
+                                        composing_xep = 'asked_once'
 
                                 chatstate_to_send = 'active'
@@ -1183 +1179 @@
                         # if peer supports jep85 and we are not 'ask', send 'active'
                         # NOTE: first active and 'ask' is set in gajim.py
-                        elif composing_jep is not False:
+                        elif composing_xep is not False:
                                 #send active chatstate on every message (as JEP says)
                                 chatstate_to_send = 'active'
@@ -1193 +1189 @@
                                 
                 if not ChatControlBase.send_message(self, message, keyID, type = 'chat',
-                chatstate = chatstate_to_send, composing_jep = composing_jep):
+                chatstate = chatstate_to_send, composing_xep = composing_xep):
                         self.print_conversation(message, self.contact.jid,
                                 encrypted = encrypted)
@@ -1486 +1482 @@
                         return
 
-                if contact.composing_jep is False: # jid cannot do jep85 nor jep22
+                if contact.composing_xep is False: # jid cannot do xep85 nor xep22
                         return
 
@@ -1494 +1490 @@
                         return
 
-                if contact.composing_jep is None:
+                if contact.composing_xep is None:
                         # we don't know anything about jid, so return
                         # NOTE:
@@ -1508 +1504 @@
                 # in JEP22, when we already sent stop composing
                 # notification on paused, don't resend it
-                if contact.composing_jep == 'JEP-0022' and \
+                if contact.composing_xep == 'XEP-0022' and \
                 contact.our_chatstate in ('paused', 'active', 'inactive') and \
                 state is not 'composing': # not composing == in (active, inactive, gone)
@@ -1530 +1526 @@
 
                 MessageControl.send_message(self, None, chatstate = state,
-                        msg_id = contact.msg_id, composing_jep = contact.composing_jep)
+                        msg_id = contact.msg_id, composing_xep = contact.composing_xep)
                 contact.our_chatstate = state
                 if contact.our_chatstate == 'active':

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)

branches/gajim_0.11.1/src/gajim.py

@@ -585 +585 @@
                         if array[1] in ('offline', 'error'):
                                 contact1.our_chatstate = contact1.chatstate = \
-                                        contact1.composing_jep = None
+                                        contact1.composing_xep = None
                                 gajim.connections[account].remove_transfers_for_contact(contact1)
                         self.roster.chg_contact_status(contact1, array[1], status_message,
@@ -614 +614 @@
         def handle_event_msg(self, account, array):
                 # 'MSG' (account, (jid, msg, time, encrypted, msg_type, subject,
-                # chatstate, msg_id, composing_jep, user_nick, xhtml))
+                # chatstate, msg_id, composing_xep, user_nick, xhtml))
                 # user_nick is JEP-0172
 
@@ -627 +627 @@
                 chatstate = array[6]
                 msg_id = array[7]
-                composing_jep = array[8]
+                composing_xep = array[8]
                 xhtml = array[10]
                 if gajim.config.get('ignore_incoming_xhtml'):
@@ -668 +668 @@
                         contact = contact[0]
                 if contact:
-                        if contact.composing_jep != 'JEP-0085': # We cache xep85 support
-                                contact.composing_jep = composing_jep
+                        if contact.composing_xep != 'XEP-0085': # We cache xep85 support
+                                contact.composing_xep = composing_xep
                         if chat_control and chat_control.type_id == message_control.TYPE_CHAT:
                                 if chatstate is not None:

branches/gajim_0.11.1/src/message_control.py

@@ -112 +112 @@
 
         def send_message(self, message, keyID = '', type = 'chat',
-        chatstate = None, msg_id = None, composing_jep = None, resource = None,
+        chatstate = None, msg_id = None, composing_xep = None, resource = None,
         user_nick = None):
                 '''Send the given message to the active tab. Doesn't return None if error
@@ -120 +120 @@
                 return gajim.connections[self.account].send_message(jid, message, keyID,
                         type = type, chatstate = chatstate, msg_id = msg_id,
-                        composing_jep = composing_jep, resource = self.resource,
+                        composing_xep = composing_xep, resource = self.resource,
                         user_nick = user_nick)