copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[bluec0re] Fix bug when server assign a contact to a group with empty name. Fixes #7865

This commit is contained in:
Yann Leboulanger 2014-10-26 16:43:44 +01:00
parent 818a403a3f
commit f087274f93
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/contacts.py
View File

@ -103,7 +103,7 @@ class Contact(CommonContact):
our_chatstate, chatstate, client_caps=client_caps) our_chatstate, chatstate, client_caps=client_caps)
self.contact_name = '' # nick choosen by contact self.contact_name = '' # nick choosen by contact
self.groups = [i for i in set(groups)] # filter duplicate values self.groups = [i if i else _('General') for i in set(groups)] # filter duplicate values
self.sub = sub self.sub = sub
self.ask = ask self.ask = ask

2
src/roster_window.py
View File

@ -313,7 +313,7 @@ class RosterWindow:
delimiter = gajim.connections[account].nested_group_delimiter delimiter = gajim.connections[account].nested_group_delimiter
group_splited = group.split(delimiter) group_splited = group.split(delimiter)
parent_group = delimiter.join(group_splited[:-1]) parent_group = delimiter.join(group_splited[:-1])
if parent_group in self._iters[account_group]['groups']: if len(group_splited) > 1 and parent_group in self._iters[account_group]['groups']:
iter_parent = self._iters[account_group]['groups'][parent_group] iter_parent = self._iters[account_group]['groups'][parent_group]
elif parent_group: elif parent_group:
iter_parent = self._add_group_iter(account, parent_group) iter_parent = self._add_group_iter(account, parent_group)