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

removed zerocony.py:check_jid and calls to it

This commit is contained in:
Stefan Bethge 2006-09-17 16:01:12 +00:00
parent 5116cb0205
commit 41c552ad42
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/zeroconf/connection_zeroconf.py
View File

@ -170,16 +170,14 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
# callbacks called from zeroconf # callbacks called from zeroconf
def _on_new_service(self,jid): def _on_new_service(self,jid):
self.roster.setItem(jid) self.roster.setItem(jid)
display_jid = self.zeroconf.check_jid(jid) self.dispatch('ROSTER_INFO', (jid, self.roster.getName(jid), 'both', 'no', self.roster.getGroups(jid)))
self.dispatch('ROSTER_INFO', (display_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', (display_jid, self.roster.getStatus(jid), self.roster.getMessage(jid), 'local', 0, None, 0))
def _on_remove_service(self,jid): def _on_remove_service(self,jid):
self.roster.delItem(jid) self.roster.delItem(jid)
# 'NOTIFY' (account, (jid, status, status message, resource, priority, # 'NOTIFY' (account, (jid, status, status message, resource, priority,
# keyID, timestamp)) # keyID, timestamp))
jid = self.zeroconf.check_jid(jid)
self.dispatch('NOTIFY', (jid, 'offline', '', 'local', 0, None, 0)) self.dispatch('NOTIFY', (jid, 'offline', '', 'local', 0, None, 0))
print 'connection_zeroconf:186' print 'connection_zeroconf:186'
@ -195,9 +193,8 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
#display contacts already detected and resolved #display contacts already detected and resolved
for jid in self.roster.keys(): for jid in self.roster.keys():
display_jid = self.zeroconf.check_jid(jid) self.dispatch('ROSTER_INFO', (jid, self.roster.getName(jid), 'both', 'no', self.roster.getGroups(jid)))
self.dispatch('ROSTER_INFO', (display_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', (display_jid, self.roster.getStatus(jid), self.roster.getMessage(jid), 'local', 0, None, 0))
self.connected = STATUS_LIST.index(show) self.connected = STATUS_LIST.index(show)

3
src/common/zeroconf/zeroconf.py
View File

@ -252,9 +252,6 @@ class Zeroconf:
return True return True
def check_jid(self, jid):
return jid
def disconnect(self): def disconnect(self):
if self.connected: if self.connected:
self.connected = False self.connected = False