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 /sugar/chat | |
parent | 1d0b4e12b8f6a0ddc7df0c80fe34796d127f80c5 (diff) |
More fixes, and convert python PS bindings to more glib style method names
Diffstat (limited to 'sugar/chat')
-rw-r--r-- | sugar/chat/ActivityChat.py | 2 | ||||
-rw-r--r-- | sugar/chat/Chat.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sugar/chat/ActivityChat.py b/sugar/chat/ActivityChat.py index ff5c057..85e61bf 100644 --- a/sugar/chat/ActivityChat.py +++ b/sugar/chat/ActivityChat.py @@ -10,7 +10,7 @@ class ActivityChat(GroupChat): self._chat_service = None self._activity = activity - self._pservice.connect('ServiceAppeared', self._service_appeared_cb) + self._pservice.connect('service-appeared', self._service_appeared_cb) # Find an existing activity chat to latch onto #activity_ps = self._pservice.getActivity(activity.get_id()) diff --git a/sugar/chat/Chat.py b/sugar/chat/Chat.py index 20c566e..ceb1ec9 100644 --- a/sugar/chat/Chat.py +++ b/sugar/chat/Chat.py @@ -233,7 +233,7 @@ class Chat(gtk.VBox): return if self._stream_writer: self._stream_writer.write(self.serialize_message(svgdata)) - owner = PresenceService.get_instance().get_owner() + owner = self._pservice.get_owner() if owner: self._insert_sketch(owner, svgdata) @@ -245,12 +245,12 @@ class Chat(gtk.VBox): self._stream_writer.write(self.serialize_message(text)) else: print 'Cannot send message, there is no stream writer' - owner = PresenceService.get_instance().get_owner() + owner = self._pservice.get_owner() if owner: self._insert_rich_message(owner, text) def serialize_message(self, message): - owner = PresenceService.get_instance().get_owner() + owner = self._pservice.get_owner() return owner.get_nick_name() + '||' + message def deserialize_message(message): |