Changeset 9953 for trunk/src/chat_control.py

Timestamp:

07/18/08 22:24:34 (5 months ago)

Author:

js

Message:

Support for displaying XEP-0184 receipts.

Files:

• trunk/src/chat_control.py (modified) (6 diffs)

trunk/src/chat_control.py

@@ -46 +46 @@
 constants = Constants()
 from common.rst_xhtml_generator import create_xhtml
-from common.xmpp.protocol import NS_XHTML, NS_FILE, NS_MUC, NS_ESESSION
+from common.xmpp.protocol import NS_XHTML, NS_FILE, NS_MUC, NS_RECEIPTS, NS_ESESSION
 
 try:
@@ -661 +661 @@
         def print_conversation_line(self, text, kind, name, tim,
         other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[],
-        count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False):
+        count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False, xep0184_id = None):
                 '''prints 'chat' type messages'''
                 jid = self.contact.jid
@@ -672 +672 @@
                         other_tags_for_name, other_tags_for_time, other_tags_for_text,
                         subject, old_kind, xhtml, simple=simple)
+
+                if xep0184_id is not None:
+                        textview.show_xep0184_warning(xep0184_id)
 
                 if not count_as_new:
@@ -1539 +1542 @@
                                 self._schedule_activity_timers()
 
-                if ChatControlBase.send_message(self, message, keyID,
-                type = 'chat', chatstate = chatstate_to_send,
-                composing_xep = composing_xep,
-                process_command = process_command):
+                id = ChatControlBase.send_message(self, message, keyID,
+                        type = 'chat', chatstate = chatstate_to_send,
+                        composing_xep = composing_xep,
+                        process_command = process_command)
+                if id:
+                        # XXX: Once we have fallback to disco, remove
+                        #      notexistant check
+                        if gajim.capscache.is_supported(contact, NS_RECEIPTS) \
+                        and not gajim.capscache.is_supported(contact,
+                        'notexistant') and gajim.config.get_per('accounts',
+                        self.account, 'request_receipt'):
+                                xep0184_id = id
+                        else:
+                                xep0184_id = None
+
                         self.print_conversation(message, self.contact.jid,
-                                encrypted = encrypted)
+                                encrypted = encrypted, xep0184_id = xep0184_id)
 
         def check_for_possible_paused_chatstate(self, arg):
@@ -1630 +1644 @@
 
         def print_conversation(self, text, frm='', tim=None, encrypted=False,
-        subject=None, xhtml=None, simple=False):
+        subject=None, xhtml=None, simple=False, xep0184_id=None):
                 # TODO: contact? ITYM frm.
                 '''Print a line in the conversation:
@@ -1684 +1698 @@
                 ChatControlBase.print_conversation_line(self, text, kind, name, tim,
                         subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml,
-                        simple=simple)
+                        simple=simple, xep0184_id=xep0184_id)
                 if text.startswith('/me ') or text.startswith('/me\n'):
                         self.old_msg_kind = None