Changeset 9960 for trunk/src/roster_window.py

Timestamp:

07/19/08 19:36:21 (5 months ago)

Author:

steve-e

Message:

Improved groupchat minimization:

• partly rewrote join_room because it was hard to read
• Correctly handle invites from anonymous rooms. Fixes #4057
• Use HIG dialog for invitation requests
• Fix bug where minimized groupchats where hidden after a reconnect
• Removed some duplicated code

Files:

• trunk/src/roster_window.py (modified) (10 diffs)

trunk/src/roster_window.py

@@ -706 +706 @@
                                 self._remove_entity(contact, account)
 
-
                         if backend:
                                 # Remove contact before redrawing, otherwise the old
@@ -731 +730 @@
                 '''
                 contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
+                # Do not show gc if we are disconnected and minimize it
+                if gajim.account_is_connected(account):
+                        show = 'online'
+                else: 
+                        show = 'offline'
+                        status = ''
+
                 if contact is None:
-                        # Do not show gc if we are disconnected and minimize it
-                        if gajim.account_is_connected(account):
-                                show = 'online'
-                        else: 
-                                show = 'offline'
-                                status = ''
+                        # New groupchat
                         contact = gajim.contacts.create_contact(jid=jid, name=jid,
                                 groups=[_('Groupchats')], show=show, status=status, sub='none')
                         gajim.contacts.add_contact(account, contact)
+                        gc_control = gajim.interface.msg_win_mgr.get_gc_control(jid, account)
+                        if gc_control:
+                                # there is a window that we can minimize
+                                gajim.interface.minimized_controls[account][jid] = gc_control
                         self.add_contact(jid, account)
                 else:
-                        contact.show = 'online'
+                        contact.show = show
+                        contact.status = status
                         self.draw_completely_and_show_if_needed(jid, account)
+
                 return contact
 
@@ -752 +759 @@
                 contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
                 if contact.is_groupchat():
+                        if jid in gajim.interface.minimized_controls[account]:
+                                gajim.interface.minimized_controls[account][jid]
                         self.remove_contact(jid, account, force=True, backend=True)
                         return True
@@ -962 +971 @@
 
                 # gets number of unread gc marked messages
-                if jid in gajim.interface.minimized_controls[account]:
+                if jid in gajim.interface.minimized_controls[account] and \
+                gajim.interface.minimized_controls[account][jid]:
                         nb_unread = len(gajim.events.get_events(account, jid,
                                 ['printed_marked_gc_msg']))
@@ -1582 +1592 @@
                 return False
 
-        def auto_join_bookmarks(self, account):
-                '''autojoin bookmarks that have 'auto join' on for this account'''
-                for bm in gajim.connections[account].bookmarks:
-                        if bm['autojoin'] in ('1', 'true'):
-                                jid = bm['jid']
-                                if not gajim.gc_connected[account].has_key(jid) or\
-                                        not gajim.gc_connected[account][jid]:
-                                        # we are not already connected
-                                        minimize = bm['minimize'] in ('1', 'true')
-                                        gajim.interface.join_gc_room(account, jid, bm['nick'],
-                                        bm['password'], minimize = minimize)
-
         def on_event_removed(self, event_list):
                 '''Remove contacts on last events removed.
@@ -2652 +2650 @@
         def on_disconnect(self, widget, jid, account):
                 '''When disconnect menuitem is activated: disconect from room'''
-                ctrl = gajim.interface.minimized_controls[account][jid]
-                del gajim.interface.minimized_controls[account][jid]
-                ctrl.shutdown()
+                if jid in gajim.interface.minimized_controls[account]:
+                        ctrl = gajim.interface.minimized_controls[account][jid]
+                        ctrl.shutdown()
                 self.remove_groupchat(jid, account)
 
@@ -2723 +2721 @@
         def on_groupchat_maximized(self, widget, jid, account):
                 '''When a groupchat is maximised'''
+                if not jid in gajim.interface.minimized_controls[account]:
+                        return
                 ctrl = gajim.interface.minimized_controls[account][jid]
                 mw = gajim.interface.msg_win_mgr.get_window(ctrl.contact.jid,
@@ -2732 +2732 @@
                 mw.new_tab(ctrl)
                 mw.set_active_tab(ctrl)
-                del gajim.interface.minimized_controls[account][jid]
-
+                
                 self.remove_groupchat(jid, account)
 
@@ -3241 +3240 @@
                 jid = model[path][C_JID].decode('utf-8')
                 resource = None
-                contact = None
+                contact = gajim.contacts.get_first_contact_from_jid(account, jid)
                 titer = model.get_iter(path)
                 if type_ in ('group', 'account'):
@@ -3248 +3247 @@
                         else:
                                 self.tree.expand_row(path, False)
-                elif jid in gajim.interface.minimized_controls[account]:
-                        self.on_groupchat_maximized(None, jid, account)
+                elif contact.is_groupchat():
+                        first_ev = gajim.events.get_first_event(account, jid)
+                        if first_ev and self.open_event(account, jid, first_ev):
+                                # We are invited to a GC
+                                # open event cares about connecting to it
+                                self.remove_groupchat(jid, account)
+                        else:
+                                self.on_groupchat_maximized(None, jid, account)
                 else:
                         first_ev = gajim.events.get_first_event(account, jid)