# HG changeset patch # User souliane # Date 1425558461 -3600 # Node ID 1bf645e73fe8a9ead26bfcea49ef4a7c7c65205c # Parent 6a8a1103ad1068f17a962e5a9ce117530da21903 browser_side: don't display MUC entities in the contact list + fixes ContactList.remove (QuickContactList and SimplePanel conflict) diff -r 6a8a1103ad10 -r 1bf645e73fe8 src/browser/sat_browser/contact_list.py --- a/src/browser/sat_browser/contact_list.py Tue Mar 03 22:31:54 2015 +0100 +++ b/src/browser/sat_browser/contact_list.py Thu Mar 05 13:27:41 2015 +0100 @@ -227,7 +227,7 @@ self._group_panel.remove(group) ### JIDS ### - to_show = [jid_ for jid_ in self._cache.keys() if self.entityToShow(jid_) and jid_!=self.whoami.bare] + to_show = [jid_ for jid_ in self.roster_entities if self.entityToShow(jid_) and jid_ != self.whoami.bare] to_show.sort() self._contacts_panel.setList(to_show) @@ -235,6 +235,10 @@ for jid_ in self._alerts: self._contacts_panel.setState(jid_, "messageWaiting", True) + def remove(self, entity): + # FIXME: SimplePanel and QuickContactList both have a 'remove' method + QuickContactList.remove(self, entity) + def onWindowResized(self, width, height): ideal_height = height - DOM.getAbsoluteTop(self.getElement()) - 5 tab_panel = self.host.panel.tab_panel