Changeset 9635

Timestamp:

05/14/08 02:34:02 (3 months ago)

Author:

bct

Message:

moved session.remove_events. fixes #3942

Location:

trunk/src

Files:

• chat_control.py (modified) (1 diff)
• common/stanza_session.py (modified) (1 diff)
• session.py (modified) (1 diff)

trunk/src/chat_control.py

@@ -925 +925 @@
                 self.parent_win.window.is_active():
                         # we are at the end
-                        if not self.session.remove_events(types_list):
+                        if self.session.remove_events(types_list):
                                 # There were events to remove
                                 self.redraw_after_event_removed(jid)

trunk/src/common/stanza_session.py

@@ -49 +49 @@
 
                 return self.loggable and account not in no_log_for and self.jid not in no_log_for
+
+        # remove events associated with this session from the queue
+        # returns True if any events were removed (unlike gajim.events.remove_events)
+        def remove_events(self, types):
+                any_removed = False
+
+                for event in gajim.events.get_events(self.conn.name, self.jid, types=types):
+                        # the event wasn't in this session
+                        if (event.type_ == 'chat' and event.parameters[8] != self) or \
+                                        (event.type_ == 'printed_chat' and event.parameters[0] != self):
+                                continue
+
+                        # events.remove_events returns True when there were no events
+                        # for some reason
+                        r = gajim.events.remove_events(self.conn.name, self.jid, event)
+
+                        if not r:
+                                any_removed = True
+
+                return any_removed
 
         def generate_thread_id(self):

trunk/src/session.py

@@ -26 +26 @@
                 if self.control:
                         self.control.session = None
-
-        # remove events associated with this session from the queue
-        def remove_events(self, types):
-                any_removed = False
-
-                for event in gajim.events.get_events(self.conn, self.jid, types=types):
-                        if event.parameters[8] != self:
-                                continue
-
-                        r = gajim.events.remove_events(self.conn, self.jid, event)
-
-                        if not_any_removed:
-                                any_removed = r
-
-                return any_removed
 
         # extracts chatstate from a <message/> stanza