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

prevent a TB and add FIXMEs for Yann

Browse source
This commit is contained in:
Nikos Kouremenos 2005-08-26 14:44:46 +00:00
parent 5bef7f8c9c
commit eabc5e6ebc
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/gajim.py
View file

@ -150,7 +150,10 @@ def get_number_of_accounts():
def get_transport_name_from_jid(jid, use_config_setting = True): def get_transport_name_from_jid(jid, use_config_setting = True):
'''returns 'aim', 'gg', 'irc' etc''' '''returns 'aim', 'gg', 'irc' etc'''
if use_config_setting and not config.get('use_transports_iconsets'): #FIXME: jid can be None! one TB I saw had this problem:
# in the code block # it is a groupchat presence in handle_event_notify
# jid was None. Yann why?
if not jid or (use_config_setting and not config.get('use_transports_iconsets')):
return return
host = jid.split('@')[-1] host = jid.split('@')[-1]
if host.startswith('aim'): if host.startswith('aim'):

5
src/gajim.py
View file

@ -341,9 +341,10 @@ class Interface:
self.remote.raise_signal('ContactAbsence', (account, array)) self.remote.raise_signal('ContactAbsence', (account, array))
# stop non active file transfers # stop non active file transfers
elif self.windows[account]['gc'].has_key(ji): elif self.windows[account]['gc'].has_key(ji): # ji is then room_jid
#it is a groupchat presence #it is a groupchat presence
#TODO: upgrade the chat instances (for pm) #FIXME: upgrade the chat instances (for pm)
#FIXME: real_jid can be None
self.windows[account]['gc'][ji].chg_contact_status(ji, resource, self.windows[account]['gc'][ji].chg_contact_status(ji, resource,
array[1], array[2], array[6], array[7], array[8], array[9], array[1], array[2], array[6], array[7], array[8], array[9],
array[10], array[11], array[12], account) array[10], array[11], array[12], account)