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

show invitation from anonymous room in roster from a groupchat rather than from a normal Contact. fixes #3448

Browse source
This commit is contained in:
Yann Leboulanger 2008-03-21 12:30:23 +00:00
parent ccb23a9e0c
commit 1008d162f4
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gajim.py
View file

@ -1666,8 +1666,12 @@ class Interface:
self.roster.show_title() self.roster.show_title()
if no_queue: # We didn't have a queue: we change icons if no_queue: # We didn't have a queue: we change icons
if not gajim.contacts.get_contact_with_highest_priority(account, jid): if not gajim.contacts.get_contact_with_highest_priority(account, jid):
# add contact to roster ("Not In The Roster") if he is not if type_ == 'gc-invitation':
self.roster.add_to_not_in_the_roster(account, jid) self.roster.add_groupchat_to_roster(account, jid,
status='offline')
else:
# add contact to roster ("Not In The Roster") if he is not
self.roster.add_to_not_in_the_roster(account, jid)
self.roster.draw_contact(jid, account) self.roster.draw_contact(jid, account)
# Show contact in roster (if he is invisible for example) and select line # Show contact in roster (if he is invisible for example) and select line

3
src/roster_window.py
View file

@ -445,8 +445,7 @@ class RosterWindow:
self.add_contact_to_roster(contact.jid, account) self.add_contact_to_roster(contact.jid, account)
return contact return contact
def add_groupchat_to_roster(self, account, jid, nick = '', resource = '', def add_groupchat_to_roster(self, account, jid, resource = '', status = ''):
status = ''):
''' add groupchat to roster ''' ''' add groupchat to roster '''
contact = gajim.contacts.get_contact_with_highest_priority(account, jid) contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
if contact == None: if contact == None: