sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

only remove the buddy if we don't see it using all CM

Browse Source
This commit is contained in:
Guillaume Desmottes 2007-02-26 12:28:50 +01:00
parent 500bd702b1
commit d49a3b52ab
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/presence2/buddy.py
View File

@ -48,7 +48,7 @@ class Buddy(dbus.service.Object):
self._icon_cache = icon_cache self._icon_cache = icon_cache
self._handle = handle self.handles = {} # tp client -> handle
self._nick_name = None self._nick_name = None
self._color = None self._color = None

20
services/presence2/presenceservice.py
View File

@ -80,6 +80,7 @@ class PresenceService(dbus.service.Object):
pass pass
def _contact_online(self, tp, handle, key): def _contact_online(self, tp, handle, key):
new_buddy = False
buddy = self._buddies.get(key) buddy = self._buddies.get(key)
if not buddy: if not buddy:
@ -89,21 +90,30 @@ class PresenceService(dbus.service.Object):
buddy.set_key(key) buddy.set_key(key)
print "create buddy" print "create buddy"
self._buddies[key] = buddy self._buddies[key] = buddy
new_buddy = True
buddies = self._handles[tp] buddies = self._handles[tp]
buddies[handle] = buddy buddies[handle] = buddy
self.BuddyAppeared(buddy.object_path()) # store the handle of the buddy for this CM
buddy.handles[tp] = handle
if new_buddy:
self.BuddyAppeared(buddy.object_path())
def _contact_offline(self, tp, handle): def _contact_offline(self, tp, handle):
buddy = self._handles[tp].pop(handle) buddy = self._handles[tp].pop(handle)
key = buddy.get_key() key = buddy.get_key()
# TODO: check if we don't see this buddy using the other CM # the handle of the buddy for this CM is not valid anymore
self._buddies.pop(key) buddy.handles.pop(tp)
print "remove buddy"
self.BuddyDisappeared(buddy.object_path()) if not buddy.handles:
# we remove the last handle of the buddy, so we don't see
# it anymore.
self._buddies.pop(key)
print "remove buddy"
self.BuddyDisappeared(buddy.object_path())
def _get_next_object_id(self): def _get_next_object_id(self):
"""Increment and return the object ID counter.""" """Increment and return the object ID counter."""

1
services/presence2/server_plugin.py
View File

@ -190,7 +190,6 @@ class ServerPlugin(gobject.GObject):
not self._ever_connected: not self._ever_connected:
# Hmm; probably aren't registered on the server, try reconnecting # Hmm; probably aren't registered on the server, try reconnecting
# and registering # and registering
self.disconnect()
del self._conn del self._conn
self._conn = self._init_connection(register=True) self._conn = self._init_connection(register=True)
self.start() self.start()