Changeset 9569 for branches/session_centric/src/message_window.py

Timestamp:

05/04/08 02:24:27 (4 months ago)

Author:

bct

Message:

pm bugfix

Files:

• branches/session_centric/src/message_window.py (modified) (3 diffs)

branches/session_centric/src/message_window.py

@@ -430 +430 @@
                 fjid = ctrl.get_full_jid()
                 thread_id = ctrl.session.thread_id
+
                 del self._controls[ctrl.account][fjid][thread_id]
 
@@ -568 +569 @@
 
         def change_key(self, old_jid, new_jid, acct):
-                '''Change the key of a control'''
+                '''Change the JID key of a control'''
                 try:
-                        # Check if control exists
-                        ctrl = self._controls[acct][old_jid]
-                except:
+                        # Check if controls exists
+                        ctrls = self._controls[acct][old_jid]
+                except KeyError:
                         return
-                self._controls[acct][new_jid] = self._controls[acct][old_jid]
+                self._controls[acct][new_jid] = ctrls
                 del self._controls[acct][old_jid]
                 if old_jid in gajim.last_message_time[acct]:
@@ -580 +581 @@
                                 gajim.last_message_time[acct][old_jid]
                         del gajim.last_message_time[acct][old_jid]
+
+        def change_thread_key(self, jid, acct, old_thread_id, new_thread_id):
+                '''Change the thread_id key of a control'''
+                try:
+                        # Check if control exists
+                        ctrl = self._controls[acct][jid][old_thread_id]
+                except KeyError:
+                        return
+
+                self._controls[acct][jid][new_thread_id] = ctrl
+                del self._controls[acct][jid][old_thread_id]
 
         def controls(self):