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

Add transports to roster only once. Fixes #3911, #3923.

Browse source
This commit is contained in:
Stephan Erb 2008-05-06 22:25:27 +00:00
parent 1e68eb3de9
commit d6b95daa8b
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/roster_window.py
View file

@ -343,8 +343,6 @@ class RosterWindow:
else: else:
# We are a normal contact. Add us to our groups. # We are a normal contact. Add us to our groups.
if not groups: if not groups:
if contact.is_transport():
contact.groups = [_('Transports')]
if contact.is_observer(): if contact.is_observer():
contact.groups = [_('Observers')] contact.groups = [_('Observers')]
groups = contact.groups groups = contact.groups
@ -620,8 +618,6 @@ class RosterWindow:
self._add_entity(contact, account) self._add_entity(contact, account)
# Draw the contact and its groups contact # Draw the contact and its groups contact
if contact.is_transport():
contact.groups = [_('Transports')]
if is_observer: if is_observer:
contact.groups = [_('Observers')] contact.groups = [_('Observers')]
groups = contact.groups groups = contact.groups
@ -667,8 +663,6 @@ class RosterWindow:
# Draw all groups of the contact # Draw all groups of the contact
groups = contact.groups groups = contact.groups
if contact.is_transport():
contact.groups = [_('Transports')]
if contact.is_observer(): if contact.is_observer():
contact.groups = [_('Observers')] contact.groups = [_('Observers')]
if not groups: if not groups:
@ -1127,8 +1121,6 @@ class RosterWindow:
contact = gajim.contacts.get_first_contact_from_jid(account, jid) contact = gajim.contacts.get_first_contact_from_jid(account, jid)
groups = contact.groups groups = contact.groups
if contact.is_transport():
contact.groups = [_('Transports')]
if contact.is_observer(): if contact.is_observer():
contact.groups = [_('Observers')] contact.groups = [_('Observers')]
if not groups: if not groups:
@ -1461,6 +1453,9 @@ class RosterWindow:
'attached_gpg_keys').split() 'attached_gpg_keys').split()
if jid in attached_keys: if jid in attached_keys:
keyID = attached_keys[attached_keys.index(jid) + 1] keyID = attached_keys[attached_keys.index(jid) + 1]
if gajim.jid_is_transport(jid):
array[jid]['groups'] = [_('Transports')]
contact1 = gajim.contacts.create_contact(jid = ji, name = name, contact1 = gajim.contacts.create_contact(jid = ji, name = name,
groups = array[jid]['groups'], show = show, status = status, groups = array[jid]['groups'], show = show, status = status,
sub = array[jid]['subscription'], ask = array[jid]['ask'], sub = array[jid]['subscription'], ask = array[jid]['ask'],