diff options
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/chat/BuddyChat.py | 15 | ||||
| -rw-r--r-- | sugar/presence/Buddy.py | 4 | ||||
| -rw-r--r-- | sugar/presence/PresenceService.py | 7 |
3 files changed, 18 insertions, 8 deletions
diff --git a/sugar/chat/BuddyChat.py b/sugar/chat/BuddyChat.py new file mode 100644 index 0000000..6d4633e --- /dev/null +++ b/sugar/chat/BuddyChat.py @@ -0,0 +1,15 @@ +from sugar.activity.Activity import Activity + +class BuddyChat(Activity): + SERVICE_TYPE = "_olpc_buddy_chat._tcp" + + def __init__(self, service): + Chat.__init__(self) + + self._stream = Stream.new_from_service(service) + self._stream.set_data_listener(self._recv_message) + self._stream_writer = self._group_stream.new_writer() + + def recv_message(self, address, msg): + print msg +# Chat.recv_message(self, self._buddy, msg) diff --git a/sugar/presence/Buddy.py b/sugar/presence/Buddy.py index c4dd0a5..6bbd787 100644 --- a/sugar/presence/Buddy.py +++ b/sugar/presence/Buddy.py @@ -142,8 +142,8 @@ class Buddy(gobject.GObject): for service in self._services.values(): if service.get_type() == stype and service.get_activity_id() == actid: return service - if self._services.has_key(stype): - return self._services[stype] + if self._services.has_key(short_stype): + return self._services[short_stype] return None def is_valid(self): diff --git a/sugar/presence/PresenceService.py b/sugar/presence/PresenceService.py index c379b85..a532954 100644 --- a/sugar/presence/PresenceService.py +++ b/sugar/presence/PresenceService.py @@ -90,10 +90,9 @@ class PresenceService(gobject.GObject): return PresenceService.__instance get_instance = staticmethod(get_instance) - def __init__(self, debug=True): + def __init__(self): gobject.GObject.__init__(self) - self._debug = debug self._lock = threading.Lock() self._started = False @@ -158,9 +157,6 @@ class PresenceService(gobject.GObject): db = dbus.Interface(self._bus.get_object(avahi.DBUS_NAME, domain_browser), avahi.DBUS_INTERFACE_DOMAIN_BROWSER) db.connect_to_signal('ItemNew', self._new_domain_cb_glue) - def set_debug(self, debug): - self._debug = debug - def get_owner(self): """Return the owner of this machine/instance, if we've recognized them yet.""" return self._owner @@ -630,7 +626,6 @@ def main(): import pygtk, gtk global ps ps = PresenceService.get_instance() - ps.set_debug(True) ps.start() gobject.timeout_add(4000, runTests) gtk.main() |