Changeset 9820

Timestamp:

06/18/08 06:11:11 (6 months ago)

Author:

bct

Message:

fix handle_event() for pms and new_chat_from_jid() for existing chat controls

Files:

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

trunk/src/gajim.py

@@ -2313 +2313 @@
 
                         if type_ == 'printed_pm':
-                                session = event.parameters[0]
+                                ctrl = event.parameters[0]
                         elif type_ == 'pm':
                                 session = event.parameters[8]
@@ -2319 +2319 @@
                         if session and session.control:
                                 ctrl = session.control
-                        else:
+                        elif not ctrl:
                                 room_jid = jid
                                 nick = resource
@@ -2724 +2724 @@
                                 resource=resource)
 
-                session = gajim.connections[account].get_or_create_session(fjid, None)
-
-                if not self.msg_win_mgr.has_window(fjid, account):
-                        session.control = self.new_chat(contact, account,
-                                resource=resource, session=session)
+                if self.msg_win_mgr.has_window(fjid, account):
+                        ctrl = self.msg_win_mgr.get_chat_controls(fjid, account)[0]
+                else:
+                        ctrl = self.new_chat(contact, account,
+                                resource=resource)
                         if len(gajim.events.get_events(account, fjid)):
-                                session.control.read_queue()
-
-                mw = session.control.parent_win
-                mw.set_active_tab(session.control)
+                                ctrl.read_queue()
+
+                mw = ctrl.parent_win
+                mw.set_active_tab(ctrl)
                 # For JEP-0172
                 if added_to_roster:
-                        session.control.user_nick = gajim.nicks[account]
+                        ctrl.user_nick = gajim.nicks[account]
 
         def on_open_chat_window(self, widget, contact, account, resource=None,