Changeset 8683 for branches/gajim_0.11.1/src/chat_control.py

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.

Files:

• branches/gajim_0.11.1/src/chat_control.py (modified) (11 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':