Changeset 9981 for trunk/src/conversation_textview.py

Timestamp:

07/22/08 16:32:37 (4 months ago)

Author:

js

Message:

* End ESession when remote signs off.
* Fix typo.
* Better code in conversation_textview.py.

@bct: Your diff didn't work, I had to move it + add an if. Seems to
work now.

Files:

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

trunk/src/conversation_textview.py

@@ -398 +398 @@
 
         def show_xep0184_warning(self, id):
-                try:
-                        if self.xep0184_marks[id] is not None:
-                                return
-                except KeyError:
-                        pass
+                if self.xep0184_marks.has_key(id):
+                        return
 
                 buffer = self.tv.get_buffer()
@@ -428 +425 @@
 
         def hide_xep0184_warning(self, id):
-                try:
-                        if self.xep0184_marks[id] is None:
-                                return
-                except KeyError:
+                if not self.xep0184_marks.has_key(id):
                         return
 
@@ -453 +447 @@
                 buffer.end_user_action()
 
-                self.xep0184_marks[id] = None
+                del self.xep0184_marks[id]
                 del self.xep0184_shown[id]