Changeset 9957

Timestamp:

07/19/08 13:57:03 (6 weeks ago)

Author:

js

Message:

Only show the XEP-0184 warning if the message has not been received
in 2 seconds.

Files:

• trunk/src/conversation_textview.py (modified) (5 diffs)

trunk/src/conversation_textview.py

@@ -44 +44 @@
 from common.exceptions import GajimGeneralException
 
+NOT_SHOWN = 0
+ALREADY_RECEIVED = 1
+SHOWN = 2
 
 def is_selection_modified(mark):
@@ -179 +182 @@
                 self.image_cache = {}
                 self.xep0184_marks = {}
+                self.xep0184_shown = {}
 
                 # It's True when we scroll in the code, so we can detect scroll from user
@@ -401 +405 @@
 
                 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)
+                self.xep0184_shown[id] = NOT_SHOWN
+
+                def show_it():
+                        if self.xep0184_shown[id] == ALREADY_RECEIVED:
+                                return False
+
+                        end_iter = buffer.get_iter_at_mark(
+                                self.xep0184_marks[id])
+                        buffer.insert(end_iter, ' ')
+                        buffer.insert_pixbuf(end_iter,
+                                ConversationTextview.XEP0184_WARNING_PIXBUF)
+
+                        self.xep0184_shown[id] = SHOWN
+                        return False
+                gobject.timeout_add(2000, show_it)
 
                 buffer.end_user_action()
@@ -427 +434 @@
                         return
 
-                buffer = self.tv.get_buffer()
-
+                if self.xep0184_shown[id] == NOT_SHOWN:
+                        self.xep0184_shown[id] = ALREADY_RECEIVED
+                        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()
+                begin_iter = buffer.get_iter_at_mark(self.xep0184_marks[id])
+
+                end_iter = begin_iter.copy()
                 # XXX: Is there a nicer way?
-                begin_iter.backward_char();
-                begin_iter.backward_char();
+                end_iter.forward_char();
+                end_iter.forward_char();
 
                 buffer.delete(begin_iter, end_iter)
@@ -444 +454 @@
 
                 self.xep0184_marks[id] = None
+                del self.xep0184_shown[id]
 
         def show_focus_out_line(self):