Author: dkirov Date: 2006-05-31 20:56:53 +0200 (Wed, 31 May 2006) New Revision: 6401
Modified: branches/gajim_0.10/src/gajim.py Log: merge r6348
Modified: branches/gajim_0.10/src/gajim.py =================================================================== --- branches/gajim_0.10/src/gajim.py 2006-05-31 18:54:39 UTC (rev 6400) +++ branches/gajim_0.10/src/gajim.py 2006-05-31 18:56:53 UTC (rev 6401) @@ -558,6 +558,10 @@ if not message: # empty message text return
+ if gajim.config.get('ignore_unknown_contacts') and \ + not gajim.contacts.get_contact(account, jid) and not pm: + return + first = False if not chat_control and not gajim.awaiting_events[account].has_key( jid_of_control): @@ -592,11 +596,6 @@ groupchat_control.on_private_message(nick, message, array[2]) return - # THIS HAS TO BE AFTER PM handling so we can get PMs - if gajim.config.get('ignore_unknown_contacts') and \ - not gajim.contacts.get_contact(account, jid): - return - if first: if gajim.config.get('notify_on_new_message') and \ helpers.allow_showing_notification(account):