Changeset 9978

Timestamp:

07/21/08 23:44:40 (4 months ago)

Author:

steve-e

Message:

Some cleanups and an attempt to fix the MUC highlight problem.

Location:

trunk/src

Files:

• gajim.py (modified) (4 diffs)
• roster_window.py (modified) (3 diffs)

trunk/src/gajim.py

@@ -711 +711 @@
                                 # Update existing iter
                                 self.roster.draw_contact(ji, account)
-                                self.roster.draw_group(_('Transports'), account)
                                 if new_show > 1 and ji in gajim.transport_avatar[account]:
                                         # transport just signed in. request avatars
@@ -2108 +2107 @@
                                         # add contact to roster ("Not In The Roster") if he is not
                                         self.roster.add_to_not_in_the_roster(account, jid)
-                        self.roster.draw_contact(jid, account)
+                        else:
+                                self.roster.draw_contact(jid, account)
 
                 # Select the contact in roster, it's visible because it has events.
@@ -2125 +2125 @@
                         if jid in self.minimized_controls[account]:
                                 self.roster.on_groupchat_maximized(None, jid, account)
-
-                        if not ctrl:
+                                return
+                        else:
                                 ctrl = self.msg_win_mgr.get_gc_control(jid, account)
 
@@ -3135 +3135 @@
 
                 if gajim.config.get('soundplayer') == '':
-                        print 'first'
                         # only on first time Gajim starts
                         commands = ('aplay', 'play', 'esdplay', 'artsplay')

trunk/src/roster_window.py

@@ -760 +760 @@
                 if contact.is_groupchat():
                         if jid in gajim.interface.minimized_controls[account]:
-                                gajim.interface.minimized_controls[account][jid]
+                                del gajim.interface.minimized_controls[account][jid]
                         self.remove_contact(jid, account, force=True, backend=True)
                         return True
@@ -2721 +2721 @@
                         return
                 ctrl = gajim.interface.minimized_controls[account][jid]
-                mw = gajim.interface.msg_win_mgr.get_window(ctrl.contact.jid,
-                        ctrl.account)
+                mw = gajim.interface.msg_win_mgr.get_window(jid, account)
                 if not mw:
                         mw = gajim.interface.msg_win_mgr.create_window(ctrl.contact,
@@ -2729 +2728 @@
                 mw.new_tab(ctrl)
                 mw.set_active_tab(ctrl)
-                
+                mw.window.window.focus()
                 self.remove_groupchat(jid, account)