Changeset 9830

Timestamp:

06/21/08 21:12:58 (5 months ago)

Author:

bct

Message:

hopefully fix some has_window bugs

Location:

trunk/src

Files:

• gajim.py (modified) (5 diffs)
• message_window.py (modified) (2 diffs)

trunk/src/gajim.py

@@ -1026 +1026 @@
                         resource = vcard['resource']
 
+                fjid = jid + '/' + str(resource)
+
                 # vcard window
                 win = None
                 if self.instances[account]['infos'].has_key(jid):
                         win = self.instances[account]['infos'][jid]
-                elif resource and self.instances[account]['infos'].has_key(
-                        jid + '/' + resource):
-                        win = self.instances[account]['infos'][jid + '/' + resource]
+                elif resource and self.instances[account]['infos'].has_key(fjid):
+                        win = self.instances[account]['infos'][fjid]
                 if win:
                         win.set_values(vcard)
@@ -1038 +1039 @@
                 # show avatar in chat
                 ctrls = []
-                if resource and self.msg_win_mgr.has_window(
-                jid + '/' + resource, account):
-                        win = self.msg_win_mgr.get_window(jid + '/' + resource,
-                                account)
-                        ctrls = win.get_controls(jid + '/' + resource, account)
+                if resource and self.msg_win_mgr.has_window(fjid, account):
+                        win = self.msg_win_mgr.get_window(fjid, account)
+                        ctrls = win.get_controls(fjid, account)
                 elif self.msg_win_mgr.has_window(jid, account):
                         win = self.msg_win_mgr.get_window(jid, account)
@@ -2127 +2126 @@
                                 session = event.parameters[8]
                                 ctrl = session.control
-
-                        if type_ == '' and self.msg_win_mgr.has_window(fjid, account):
-                                ctrl = self.msg_win_mgr.get_chat_controls(fjid, account)[0]
-                        elif not ctrl:
+                        elif type_ == '':
+                                ctrls = self.msg_win_mgr.get_chat_controls(fjid, account)
+
+                                if ctrls:
+                                        ctrl = ctrls[0]
+
+                        if not ctrl:
                                 highest_contact = gajim.contacts.get_contact_with_highest_priority(
                                         account, jid)
@@ -2444 +2446 @@
                 self.emoticons_menu = self.prepare_emoticons_menu()
 
-################################################################################                
+################################################################################
 ### Methods for opening new messages controls
 ################################################################################
@@ -2575 +2577 @@
                                 resource=resource)
 
-                if self.msg_win_mgr.has_window(fjid, account):
-                        ctrl = self.msg_win_mgr.get_chat_controls(fjid, account)[0]
+                ctrls = self.msg_win_mgr.get_chat_controls(fjid, account)
+                if ctrls:
+                        ctrl = ctrls[0]
                 else:
                         ctrl = self.new_chat(contact, account,

trunk/src/message_window.py

@@ -621 +621 @@
                         nth_child = notebook.get_nth_page(page_num)
                         return self._widget_to_control(nth_child)
+
+        def has_control(self, jid, acct):
+                sessioned = (acct in self._controls and jid in self._controls[acct] \
+                        and self._controls[acct][jid])
+
+                return sessioned or self.sessionless_controls(acct, jid)
 
         def get_gc_control(self, jid, acct):
@@ -925 +931 @@
         def get_window(self, jid, acct):
                 for win in self.windows():
-                        if (acct in win._controls and jid in win._controls[acct]) or \
-                        (acct in win.sessionless_ctrls and jid in win.sessionless_ctrls[acct]):
-                                        return win
+                        if win.has_control(jid, acct):
+                                return win
 
                 return None