Changeset 9761

Timestamp:

06/05/08 17:09:17 (6 months ago)

Author:

jim++

Message:

Regroup window.present() calls. See #3908.

Location:

trunk/src

Files:

• chat_control.py (modified) (1 diff)
• gajim.py (modified) (5 diffs)
• groupchat_control.py (modified) (1 diff)
• message_window.py (modified) (1 diff)
• roster_window.py (modified) (3 diffs)
• systray.py (modified) (1 diff)

trunk/src/chat_control.py

@@ -2040 +2040 @@
                 gajim.events.remove_events(self.account, self.get_full_jid(),
                         types = ['printed_' + self.type_id, self.type_id])
-                # remove all register handlers on wigets, created by self.xml
+                # remove all register handlers on widgets, created by self.xml
                 # to prevent circular references among objects
                 for i in self.handlers.keys():

trunk/src/gajim.py

@@ -2523 +2523 @@
                 if w:
                         w.set_active_tab(ctrl)
-                        w.window.present()
                         w.window.window.focus()
                         # Using isinstance here because we want to catch all derived types
@@ -2765 +2764 @@
                         gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account)
                         win = gc_ctrl.parent_win
-                        win.window.present()
                         win.set_active_tab(gc_ctrl)
                         dialogs.ErrorDialog(_('You are already in group chat %s') % room_jid)
@@ -2793 +2791 @@
                         gc_control = self.msg_win_mgr.get_gc_control(room_jid, account)
                         gc_control.parent_win.set_active_tab(gc_control)
-                        gc_control.parent_win.window.present()
                 gajim.connections[account].join_gc(nick, room_jid, password)
                 if password:
@@ -2893 +2890 @@
                 mw = session.control.parent_win
                 mw.set_active_tab(session.control)
-                mw.window.present()
                 # For JEP-0172
                 if added_to_roster:
@@ -2931 +2927 @@
                         for ctrl in win.get_controls(fjid, account):
                                 ctrl.got_disconnected()
-
-                win.window.present()
 
 ################################################################################                

trunk/src/groupchat_control.py

@@ -2077 +2077 @@
 
                 win.set_active_tab(ctrl)
-                win.window.present()
 
                 return ctrl

trunk/src/message_window.py

@@ -449 +449 @@
                 ctrl_page = self.notebook.page_num(ctrl.widget)
                 self.notebook.set_current_page(ctrl_page)
+                self.window.present()
 
         def remove_tab(self, ctrl, method, reason = None, force = False):

trunk/src/roster_window.py

@@ -1157 +1157 @@
                         win = gajim.interface.msg_win_mgr.get_window(room_jid, account)
                         ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid, account)
-                        win.window.present()
                         win.set_active_tab(ctrl)
                         dialogs.ErrorDialog(_('You are already in group chat %s') % room_jid)
@@ -1186 +1185 @@
                         gc_control = gc_win.get_gc_control(room_jid, account)
                         gc_win.set_active_tab(gc_control)
-                        gc_win.window.present()
                 gajim.connections[account].join_gc(nick, room_jid, password)
                 if password:
@@ -2814 +2812 @@
                 mw.new_tab(ctrl)
                 mw.set_active_tab(ctrl)
-                mw.window.present()
                 del gajim.interface.minimized_controls[account][jid]
 

trunk/src/systray.py

@@ -110 +110 @@
                         gajim.interface.msg_win_mgr.get_window(jid, account).set_active_tab(
                                 jid, account)
-                        gajim.interface.msg_win_mgr.get_window(jid, account).window.present()
                 elif contact:
                         gajim.interface.new_chat(contact, account)