diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-06-22 19:59:38 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-06-22 19:59:38 (GMT) |
commit | 0a305004b08cab01c1ae42a069d77b1517491f99 (patch) | |
tree | 1be7256862ca5318f36934ef9fe9e63b48b5d3b5 /sugar | |
parent | 49aa3ffcba7b6957605c0f63bb5be2fee61bde14 (diff) |
Some work getting the one-to-one chat back
Diffstat (limited to 'sugar')
-rw-r--r-- | sugar/chat/BuddyChat.py | 15 | ||||
-rw-r--r-- | sugar/presence/Buddy.py | 1 | ||||
-rw-r--r-- | sugar/presence/PresenceService.py | 7 |
3 files changed, 17 insertions, 6 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 65405e8..c3dfae4 100644 --- a/sugar/presence/Buddy.py +++ b/sugar/presence/Buddy.py @@ -149,6 +149,7 @@ class Buddy(gobject.GObject): for service in self._services.values(): if service.get_type() == short_stype and service.get_activity_uid() == uid: return service + print self._services.keys() if self._services.has_key(short_stype): return self._services[short_stype] return None diff --git a/sugar/presence/PresenceService.py b/sugar/presence/PresenceService.py index 276bd69..6db6e80 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 @@ -163,9 +162,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 @@ -648,7 +644,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() |