Changeset 9840

Timestamp:

06/25/08 15:15:05 (5 months ago)

Author:

steve-e

Message:

Various roster_window and modelfilter fixes.

• Do not double escape group names
• Try to remove SelfContact? on disconnect only once
• Do not show minimized groupchats which were minimized after disconnect
• Always reset group expand state after adding a contact to roster.

Files:

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

trunk/src/roster_window.py

@@ -490 +490 @@
                 # Remove childs first then big brother
                 family_in_roster = False
+                big_brother_jid = None
                 for data in nearby_family:
                         _account = data['account']
@@ -522 +523 @@
                 if not family_in_roster:
                         return False
-
+        
+                assert old_big_jid, 'No Big Brother in nearby family % (Family: %)' % \
+                        (nearby_family, family)
                 iters = self._get_contact_iter(old_big_jid, old_big_account,
                         old_big_contact, self.model)
@@ -666 +669 @@
                         for group in contact.get_shown_groups():
                                 self.draw_group(group, account)
+                                self._adjust_group_expand_collapse_state(group, account)
                         self.draw_account(account)
 
@@ -729 +733 @@
                 contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
                 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 = ''
                         contact = gajim.contacts.create_contact(jid = jid, name = jid,
-                                groups = [_('Groupchats')], show = 'online',
+                                groups = [_('Groupchats')], show = show,
                                 status = status, sub = 'none')
                         gajim.contacts.add_contact(account, contact)
@@ -736 +746 @@
                 else:
                         contact.show = 'online'
-                        self.draw_contact(jid, account)
+                        self.draw_completely_and_show_if_needed(jid, account)
                 return contact
 
@@ -923 +933 @@
                         text += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total))
 
-                self.model[child_iter][C_NAME] = gobject.markup_escape_text(text)
+                self.model[child_iter][C_NAME] = text
                 return False
 
@@ -1873 +1883 @@
                                         c.is_transport())]:
                                                 self.chg_contact_status(contact, 'offline', '', account)
-                                # Remove SelfContact from roster and remove it.
-                                # It might be gone when we return
-                                self_jid = gajim.get_jid_from_account(account)
-                                self.remove_contact(self_jid, account, backend = True)
                         self.actions_menu_needs_rebuild = True
                 self.update_status_combobox()
@@ -2645 +2651 @@
                 del gajim.interface.minimized_controls[account][jid]
                 ctrl.shutdown()
-
                 self.remove_groupchat(jid, account)