Author: js Date: 2008-07-11 14:34:43 +0200 (Fri, 11 Jul 2008) New Revision: 9908

Modified: trunk/src/chat_control.py trunk/src/common/connection_handlers.py Log: If we receive an error PEP packet, don't treat it as incoming PEP event

Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-11 07:42:57 UTC (rev 9907) +++ trunk/src/chat_control.py 2008-07-11 12:34:43 UTC (rev 9908) @@ -1816,8 +1816,7 @@ if not hide_buttonbar_entries and _('Not in Roster') in contact.groups: add_to_roster_menuitem.show()

- # If we don't have resource, we can't do file transfer - # in transports, contact holds our info we need to disable it too + # check if it's possible to send a file if gajim.capscache.is_supported(contact, NS_FILE): send_file_menuitem.set_sensitive(True) else:

Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-07-11 07:42:57 UTC (rev 9907) +++ trunk/src/common/connection_handlers.py 2008-07-11 12:34:43 UTC (rev 9908) @@ -1616,7 +1616,8 @@

# check if the message is pubsub#event if msg.getTag('event') is not None: - self._pubsubEventCB(con, msg) + if msg.getTag('error') is None: + self._pubsubEventCB(con, msg) return

# check if the message is a XEP-0070 confirmation request