Author: asterix Date: 2007-05-13 09:10:12 +0200 (Sun, 13 May 2007) New Revision: 8146

Modified: trunk/src/common/zeroconf/connection_zeroconf.py Log: fix traceback with zeroconf

Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2007-05-12 21:49:49 UTC (rev 8145) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2007-05-13 07:10:12 UTC (rev 8146) @@ -179,7 +179,7 @@ self.dispatch('ROSTER_INFO', (key, self.roster.getName(key), 'both', 'no', self.roster.getGroups(key))) self.dispatch('NOTIFY', (key, self.roster.getStatus(key), - self.roster.getMessage(key), 'local', 0, None, 0)) + self.roster.getMessage(key), 'local', 0, None, 0, None)) #XXX open chat windows don't get refreshed (full name), add that return self.call_resolve_timeout

@@ -187,13 +187,13 @@ def _on_new_service(self,jid): self.roster.setItem(jid) self.dispatch('ROSTER_INFO', (jid, self.roster.getName(jid), 'both', 'no', self.roster.getGroups(jid))) - self.dispatch('NOTIFY', (jid, self.roster.getStatus(jid), self.roster.getMessage(jid), 'local', 0, None, 0)) + self.dispatch('NOTIFY', (jid, self.roster.getStatus(jid), self.roster.getMessage(jid), 'local', 0, None, 0, None)) def _on_remove_service(self, jid): self.roster.delItem(jid) # 'NOTIFY' (account, (jid, status, status message, resource, priority, - # keyID, timestamp)) - self.dispatch('NOTIFY', (jid, 'offline', '', 'local', 0, None, 0)) + # keyID, timestamp, contact_nickname)) + self.dispatch('NOTIFY', (jid, 'offline', '', 'local', 0, None, 0, None))

def _on_disconnected(self): self.disconnect() @@ -259,7 +259,7 @@ #display contacts already detected and resolved for jid in self.roster.keys(): self.dispatch('ROSTER_INFO', (jid, self.roster.getName(jid), 'both', 'no', self.roster.getGroups(jid))) - self.dispatch('NOTIFY', (jid, self.roster.getStatus(jid), self.roster.getMessage(jid), 'local', 0, None, 0)) + self.dispatch('NOTIFY', (jid, self.roster.getStatus(jid), self.roster.getMessage(jid), 'local', 0, None, 0, None))

self.connected = STATUS_LIST.index(show)