Changeset 6401 for branches/gajim_0.10/src/gajim.py

Timestamp:

05/31/06 20:56:53 (3 years ago)

Author:

dkirov

Message:

merge r6348

Files:

• branches/gajim_0.10/src/gajim.py (modified) (2 diffs)

branches/gajim_0.10/src/gajim.py

@@ -559 +559 @@
                         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(
@@ -593 +597 @@
                         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 \