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

Timestamp:

05/04/08 02:24:27 (4 months ago)

Author:

bct

Message:

pm bugfix

Files:

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

branches/session_centric/src/groupchat_control.py

@@ -605 +605 @@
 
                 # We print if window is opened
-                pm_control = gajim.interface.msg_win_mgr.get_control(fjid, self.account, session)
+                pm_control = session.control
 
                 if pm_control:
@@ -633 +633 @@
                                 self.parent_win.redraw_tab(self)
                 else:
-                        self._start_private_message(nick, session)
+                        self._start_private_message(nick)
                 # Scroll to line
                 self.list_treeview.expand_row(path[0:1], False)
@@ -892 +892 @@
                 fjid = gajim.construct_fjid(self.room_jid, nick) # 'fake' jid
 
-                self._start_private_message(nick)
+                ctrl = self._start_private_message(nick)
                 if msg:
-                        gajim.interface.msg_win_mgr.get_control(fjid, self.account).\
-                                send_message(msg)
+                        ctrl.send_message(msg)
 
         def on_send_file(self, widget, gc_contact):
@@ -2042 +2041 @@
                 win.window.present()
 
+                return ctrl
+
         def on_row_activated(self, widget, path):
                 '''When an iter is activated (dubblick or single click if gnome is set
@@ -2100 +2101 @@
 
                         if gajim.single_click and not event.state & gtk.gdk.SHIFT_MASK:
-                                self.on_row_activated(widget, path)                     
+                                self.on_row_activated(widget, path)
                                 return True
                         else: