Changeset 9846 for trunk/src/gajim.py

Timestamp:

06/27/08 01:36:58 (5 months ago)

Author:

bct

Message:

first pass at stripping out the one-tab-per-session code

Files:

• trunk/src/gajim.py (modified) (7 diffs)

trunk/src/gajim.py

@@ -539 +539 @@
                                 return
 
-                for ctrl in self.msg_win_mgr.get_chat_controls(jid_from, account):
-                        if ctrl.type_id == message_control.TYPE_GC:
-                                ctrl.print_conversation('Error %s: %s' % (array[2], array[1]))
+                ctrl = self.msg_win_mgr.get_control(jid_from, account)
+                if ctrl and ctrl.type_id == message_control.TYPE_GC:
+                        ctrl.print_conversation('Error %s: %s' % (array[2], array[1]))
 
         def handle_event_con_type(self, account, con_type):
@@ -662 +662 @@
                                 # don't have to open a new tab if a new session comes in
 
-                                for ctrl in self.msg_win_mgr.get_chat_controls(jid, account):
+                                ctrl = self.msg_win_mgr.get_control(jid, account)
+                                if ctrl:
                                         ctrl.set_session(None)
 
@@ -813 +814 @@
                                 nick = jids[1]
 
-                                ctrl = None
                                 if session:
                                         ctrl = session.control
-
-                                if not ctrl:
-                                        ctrls = self.msg_win_mgr.get_chat_controls(full_jid_with_resource, account)
-                                        if ctrls:
-                                                ctrl = ctrls[0]
+                                else:
+                                        ctrl = self.msg_win_mgr.get_control(full_jid_with_resource, account)
 
                                 if not ctrl:
@@ -1125 +1122 @@
                         self.roster.draw_contact(room_jid, account)
 
-                # print status in chat windows and update status/GPG image
-                for ctrl in self.msg_win_mgr.get_chat_controls(fjid, account):
+                # print status in chat window and update status/GPG image
+                ctrl = self.msg_win_mgr.get_control(fjid, account)
+                if ctrl:
                         statusCode = array[9]
                         if '303' in statusCode:
@@ -1818 +1816 @@
 
         def handle_event_ping_sent(self, account, contact):
-                for ctrl in self.msg_win_mgr.get_chat_controls(contact.jid, account):
-                        ctrl.print_conversation(_('Ping?'), 'status')
-                for ctrl in self.msg_win_mgr.get_chat_controls(contact.get_full_jid(), account):
-                        ctrl.print_conversation(_('Ping?'), 'status')
+                for jid in [contact.jid, contact.get_full_jid()]:
+                        ctrl = self.msg_win_mgr.get_control(jid, account)
+                        if ctrl:
+                                ctrl.print_conversation(_('Ping?'), 'status')
 
         def handle_event_ping_reply(self, account, data):
                 contact = data[0]
                 seconds = data[1]
-                for ctrl in self.msg_win_mgr.get_chat_controls(contact.jid, account):
-                        ctrl.print_conversation(_('Pong! (%s s.)') % seconds, 'status')
-                for ctrl in self.msg_win_mgr.get_chat_controls(contact.get_full_jid(), account):
-                        ctrl.print_conversation(_('Pong! (%s s.)') % seconds, 'status')
+
+                for jid in [contact.jid, contact.get_full_jid()]:
+                        ctrl = self.msg_win_mgr.get_control(jid, account)
+                        if ctrl:
+                                ctrl.print_conversation(_('Pong! (%s s.)') % seconds, 'status')
 
         def handle_event_ping_error(self, account, contact):
-                for ctrl in self.msg_win_mgr.get_chat_controls(contact.jid, account):
-                        ctrl.print_conversation(_('Error.'), 'status')
-                for ctrl in self.msg_win_mgr.get_chat_controls(contact.get_full_jid(), account):
-                        ctrl.print_conversation(_('Error.'), 'status')
+                for jid in [contact.jid, contact.get_full_jid()]:
+                        ctrl = self.msg_win_mgr.get_control(jid, account)
+                        if ctrl:
+                                ctrl.print_conversation(_('Error.'), 'status')
 
         def handle_event_search_form(self, account, data):
@@ -2127 +2126 @@
                                 ctrl = session.control
                         elif type_ == '':
-                                ctrls = self.msg_win_mgr.get_chat_controls(fjid, account)
-
-                                if ctrls:
-                                        ctrl = ctrls[0]
+                                ctrl = self.msg_win_mgr.get_control(fjid, account)
 
                         if not ctrl:
@@ -2579 +2575 @@
                                 resource=resource)
 
-                ctrls = self.msg_win_mgr.get_chat_controls(fjid, account)
-                if ctrls:
-                        ctrl = ctrls[0]
-                else:
+                ctrl = self.msg_win_mgr.get_control(fjid, account)
+
+                if not ctrl:
                         ctrl = self.new_chat(contact, account,
                                 resource=resource)