Changeset 9953

Timestamp:

07/18/08 22:24:34 (7 weeks ago)

Author:

js

Message:

Support for displaying XEP-0184 receipts.

Location:

trunk

Files:

• data/pixmaps/xep0184.png (added)
• src/chat_control.py (modified) (6 diffs)
• src/common/connection_handlers.py (modified) (1 diff)
• src/conversation_textview.py (modified) (3 diffs)
• src/message_control.py (modified) (1 diff)

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

trunk/src/common/connection_handlers.py

@@ -1730 +1730 @@
                         con.send(receipt)
 
+                # We got our message's receipt
+                if msg.getTag('received', namespace=common.xmpp.NS_RECEIPTS) \
+                and session.control and gajim.config.get_per('accounts',
+                self.name, 'request_receipt'):
+                        session.control.conv_textview.hide_xep0184_warning(
+                                msg.getID())
+
                 addressTag = msg.getTag('addresses', namespace = common.xmpp.NS_ADDRESS)
 

trunk/src/conversation_textview.py

@@ -149 +149 @@
         for chat/groupchat windows'''
 
-        path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'muc_separator.png')
-        FOCUS_OUT_LINE_PIXBUF = gtk.gdk.pixbuf_new_from_file(path_to_file)
+        FOCUS_OUT_LINE_PIXBUF = gtk.gdk.pixbuf_new_from_file(os.path.join(
+                gajim.DATA_DIR, 'pixmaps', 'muc_separator.png'))
+        XEP0184_WARNING_PIXBUF = gtk.gdk.pixbuf_new_from_file(os.path.join(
+                gajim.DATA_DIR, 'pixmaps', 'xep0184.png'))
 
         # smooth scroll constants
@@ -176 +178 @@
                 self.images = []
                 self.image_cache = {}
+                self.xep0184_marks = {}
 
                 # It's True when we scroll in the code, so we can detect scroll from user
@@ -389 +392 @@
                         self.smooth_id = None
                         self.smooth_scroll_timer.cancel()
+
+        def show_xep0184_warning(self, id):
+                try:
+                        if self.xep0184_marks[id] is not None:
+                                return
+                except KeyError:
+                        pass
+
+                buffer = self.tv.get_buffer()
+
+                buffer.begin_user_action()
+
+                end_iter = buffer.get_end_iter()
+                buffer.insert(end_iter, ' ')
+                buffer.insert_pixbuf(end_iter,
+                        ConversationTextview.XEP0184_WARNING_PIXBUF)
+
+                end_iter = buffer.get_end_iter();
+                before_img_iter = end_iter.copy()
+                # XXX: Is there a nicer way?
+                before_img_iter.backward_char();
+                before_img_iter.backward_char();
+
+                self.xep0184_marks[id] = buffer.create_mark(None,
+                        buffer.get_end_iter(), left_gravity=True)
+
+                buffer.end_user_action()
+
+        def hide_xep0184_warning(self, id):
+                try:
+                        if self.xep0184_marks[id] is None:
+                                return
+                except KeyError:
+                        return
+
+                buffer = self.tv.get_buffer()
+
+                buffer.begin_user_action()
+
+                end_iter = buffer.get_iter_at_mark(self.xep0184_marks[id])
+
+                begin_iter = end_iter.copy()
+                # XXX: Is there a nicer way?
+                begin_iter.backward_char();
+                begin_iter.backward_char();
+
+                buffer.delete(begin_iter, end_iter)
+                buffer.delete_mark(self.xep0184_marks[id])
+
+                buffer.end_user_action()
+
+                self.xep0184_marks[id] = None
 
         def show_focus_out_line(self):

trunk/src/message_control.py

@@ -168 +168 @@
                 # Send and update history
                 return conn.send_message(jid, message, keyID, type = type,
-                        chatstate = chatstate, msg_id = msg_id, composing_xep = composing_xep,
+                        chatstate = chatstate, msg_id = msg_id,
+                        composing_xep = composing_xep,
                         resource = self.resource, user_nick = user_nick,
-                        session = self.session, original_message = original_message)
+                        session = self.session,
+                        original_message = original_message)