Changeset 9560 for branches/session_centric/src/groupchat_control.py

Timestamp:

05/03/08 02:10:17 (7 months ago)

Author:

bct

Message:

pm fixes

Files:

• branches/session_centric/src/groupchat_control.py (modified) (6 diffs)

branches/session_centric/src/groupchat_control.py

@@ -122 +122 @@
         def __init__(self, parent_win, gc_contact, contact, account, session):
                 room_jid = contact.jid.split('/')[0]
-                room_ctrl = gajim.interface.msg_win_mgr.get_control(room_jid, account)
+                room_ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid, account)
                 if gajim.interface.minimized_controls[account].has_key(room_jid):
                         room_ctrl = gajim.interface.minimized_controls[account][room_jid]
@@ -449 +449 @@
                 if color_name:
                         color = gtk.gdk.colormap_get_system().alloc_color(color_name)
-                        
+
                 label_str = self.name
-                
+
                 # count waiting highlighted messages
                 unread = ''
@@ -605 +605 @@
 
                 # We print if window is opened
-                pm_control = gajim.interface.msg_win_mgr.get_control(fjid, self.account)
+                pm_control = gajim.interface.msg_win_mgr.get_control(fjid, self.account, session)
+
                 if pm_control:
                         pm_control.print_conversation(msg, tim = tim, xhtml = xhtml)
+
                         return
 
@@ -884 +886 @@
         def on_send_pm(self, widget = None, model = None, iter = None, nick = None,
         msg = None):
-                '''opens a chat window and msg is not None sends private message to a
+                '''opens a chat window and if msg is not None sends private message to a
                 contact in a room'''
                 if nick is None:
@@ -1604 +1606 @@
                         # Update pm chat window
                         fjid = self.room_jid + '/' + nick
-                        ctrl = gajim.interface.msg_win_mgr.get_control(fjid, self.account)
+                        ctrl = gajim.interface.msg_win_mgr.get_gc_control(fjid, self.account)
                         if ctrl:
                                 contact = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick)
@@ -2034 +2036 @@
                         gajim.interface.roster.new_private_chat(gc_c, self.account)
                         win = gajim.interface.msg_win_mgr.get_window(nick_jid, self.account)
-                win.set_active_tab(nick_jid, self.account)
+
+                ctrl = win.get_controls(nick_jid, self.account)[0]
+
+                win.set_active_tab(ctrl)
                 win.window.present()