diff options
| author | Dan Williams <dcbw@localhost.localdomain> | 2006-07-23 14:21:00 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@localhost.localdomain> | 2006-07-23 14:21:00 (GMT) |
| commit | 7c996b00114c1cdc6579af57a7da63639b5fe1d5 (patch) | |
| tree | 340367b4a5f38ccc2db853a1e5996fad0851ba27 /activities | |
| parent | 1d0b4e12b8f6a0ddc7df0c80fe34796d127f80c5 (diff) | |
More fixes, and convert python PS bindings to more glib style method names
Diffstat (limited to 'activities')
| -rw-r--r-- | activities/browser/BrowserActivity.py | 2 | ||||
| -rw-r--r-- | activities/chat/ChatActivity.py | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/activities/browser/BrowserActivity.py b/activities/browser/BrowserActivity.py index f1f40af..5cb64c0 100644 --- a/activities/browser/BrowserActivity.py +++ b/activities/browser/BrowserActivity.py @@ -57,7 +57,7 @@ class BrowserActivity(Activity): vbox.show() self._pservice = PresenceService() - self._pservice.connect('ServiceAppeared', self._service_appeared_cb) + self._pservice.connect('service-appeared', self._service_appeared_cb) # Join the shared activity if we were started from one if self._initial_service: diff --git a/activities/chat/ChatActivity.py b/activities/chat/ChatActivity.py index 5a8f383..3239b6e 100644 --- a/activities/chat/ChatActivity.py +++ b/activities/chat/ChatActivity.py @@ -54,17 +54,14 @@ class ChatListener: self._chats = {} - self._pservice = PresenceService.get_instance() - self._pservice.start() - self._pservice.track_service_type(BuddyChat.SERVICE_TYPE) + self._pservice = PresenceService() + self._pservice.register_service_type(BuddyChat.SERVICE_TYPE) def start(self): - port = random.randint(5000, 65535) - service = Service.Service(sugar.env.get_nick_name(), BuddyChat.SERVICE_TYPE, - 'local', '', port) - self._buddy_stream = Stream.new_from_service(service) + self._service = self._pservice.register_service(sugar.env.get_nick_name(), + BuddyChat.SERVICE_TYPE) + self._buddy_stream = Stream.new_from_service(self._service) self._buddy_stream.set_data_listener(self._recv_message) - self._pservice.register_service(service) def _recv_message(self, address, message): [nick, msg] = Chat.deserialize_message(message) |