Changeset 8955 for branches/gajim_0.11.2/src/message_window.py

Timestamp:

11/09/07 20:30:15 (13 months ago)

Author:

asterix

Message:

merge some fixes from trunk: [8864] [8866] [8881] [8884] [8887] [8894] [8895] [8902] [8903] [8904] [8905] [8906] [8910] [8918] [8919] [8921] [8923] [8924] [8938] [8942] [8952] [8953] [8954]

Files:

• branches/gajim_0.11.2/src/message_window.py (modified) (2 diffs)

branches/gajim_0.11.2/src/message_window.py

@@ -439 +439 @@
                         nth_child = notebook.get_nth_page(page_num)
                         return self._widget_to_control(nth_child)
+
+        def change_key(self, old_jid, new_jid, acct):
+                '''Change the key of a control'''
+                try:
+                        # Check if control exists
+                        ctrl = self._controls[acct][old_jid]
+                except:
+                        return
+                self._controls[acct][new_jid] = self._controls[acct][old_jid]
+                del self._controls[acct][old_jid]
 
         def controls(self):
@@ -767 +777 @@
                 return win
 
+        def change_key(self, old_jid, new_jid, acct):
+                win = self.get_window(old_jid, acct)
+                if self.mode == self.ONE_MSG_WINDOW_NEVER:
+                        old_key = acct + old_jid
+                        if old_jid not in self._windows:
+                                return
+                        new_key = acct + new_jid
+                        self._windows[new_key] = self._windows[old_key]
+                        del self._windows[old_key]
+                win.change_key(old_jid, new_jid, acct)
+
         def _on_window_delete(self, win, event):
                 self.save_state(self._gtk_win_to_msg_win(win))