changeset 324c16fc8f10 in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=324c16fc8f10 description: [Maranda] ignore directory category of type server, if an identity with server category is present. Fixes #7499

diffstat:

src/disco.py | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r aa7b42be930e -r 324c16fc8f10 src/disco.py --- a/src/disco.py Wed Oct 30 15:28:24 2013 +0100 +++ b/src/disco.py Wed Oct 30 16:38:01 2013 +0100 @@ -942,9 +942,17 @@ Set the window title based on agent info """ # Set the banner and window title - if 'name' in identities[0]: - name = identities[0]['name'] - self.window._set_window_banner_text(self._get_agent_address(), name) + if len(identities) > 1: + # Check if an identity with server category is present + for i, _identity in enumerate(identities): + if _identity['category'] == 'server' and 'name' in _identity: + name = _identity['name'] + break + elif 'name' in identities[0]: + name = identities[0]['name'] + + if name: + self.window._set_window_banner_text(self._get_agent_address(), name)

# Add an icon to the banner. pix = self.cache.get_icon(identities, addr=self._get_agent_address())