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

Timestamp:

05/02/08 04:32:28 (7 months ago)

Author:

bct

Message:

fixed groupchat

Files:

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

branches/session_centric/src/message_window.py

@@ -397 +397 @@
                         gtkgui_helpers.set_unset_urgency_hint(self.window, False)
 
-        def set_active_tab(self, session):
-                ctrl = self._controls[session.conn.name][session.jid][session.thread_id]
+        def set_active_tab(self, ctrl):
                 ctrl_page = self.notebook.page_num(ctrl.widget)
                 self.notebook.set_current_page(ctrl_page)
@@ -539 +538 @@
                         ctrl.update_tags()
 
-        def get_control(self, key, acct):
+        def get_control(self, key, acct, thread_id):
                 '''Return the MessageControl for jid or n, where n is a notebook page index.
-                When key is an int index acct may be None'''
+                When key is an int index acct and thread_id may be None'''
                 if isinstance(key, str):
                         key = unicode(key, 'utf-8')
@@ -548 +547 @@
                         jid = key
                         try:
-                                return self._controls[acct][jid]
+                                return self._controls[acct][jid][thread_id]
                         except:
                                 return None
@@ -558 +557 @@
                         nth_child = notebook.get_nth_page(page_num)
                         return self._widget_to_control(nth_child)
+
+        def get_gc_control(self, jid, acct):
+                return self.get_control(jid, acct, 'gc')
+
+        def get_controls(self, jid, acct):
+                try:
+                        return self._controls[acct][jid].values()
+                except KeyError:
+                        return []
 
         def change_key(self, old_jid, new_jid, acct):
@@ -595 +603 @@
                                 if ind < 0:
                                         ind = self.notebook.get_n_pages() - 1
-                        ctrl = self.get_control(ind, None)
+                        ctrl = self.get_control(ind, None, None)
                         if ctrl.get_nb_unread() > 0:
                                 found = True
@@ -787 +795 @@
         def get_window(self, jid, acct):
                 for win in self.windows():
-                        if win.get_control(jid, acct):
-                                return win
+                        try:
+                                if win._controls[acct][jid]:
+                                        return win
+                        except KeyError:
+                                pass
+                return None
+
+        def get_gc_control(self, jid, acct):
+                win = self.get_window(jid, acct)
+
+                if win:
+                        return win.get_gc_control(jid, acct)
+
                 return None
 
@@ -915 +934 @@
                                 return
 
-        def get_control(self, jid, acct):
+        def get_control(self, jid, acct, session):
                 '''Amongst all windows, return the MessageControl for jid'''
                 win = self.get_window(jid, acct)
                 if win:
-                        return win.get_control(jid, acct)
+                        return win.get_control(jid, acct, session)
                 return None
 
@@ -930 +949 @@
                                 ctrls.append(c)
                 return ctrls
+
+        def get_chat_controls(self, jid, acct):
+                win = self.get_window(jid, acct)
+
+                if win:
+                        return win.get_controls(jid, acct)
+                else:
+                        return []
 
         def windows(self):