Start refactoring to get back buddy chat to work...

2 files changed, 33 insertions, 0 deletions

diff --git a/shell/ChatListener.py b/shell/ChatListener.py
new file mode 100644
index 0000000..6c0f6de
--- /dev/null
+++ b/shell/ChatListener.py
@@ -0,0 +1,29 @@
+from sugar import env
+from sugar.chat.BuddyChat import BuddyChat
+from sugar.activity import ActivityFactory
+from sugar.presence.PresenceService import PresenceService
+from sugar.p2p.Stream import Stream
+
+class ChatListener:
+	def __init__(self):
+		self._chats = {}
+	
+		self._pservice = PresenceService()
+		self._pservice.register_service_type(BuddyChat.SERVICE_TYPE)
+
+	def start(self):
+		self._service = self._pservice.register_service(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)
+
+	def _recv_message(self, address, message):
+		[nick, msg] = Chat.deserialize_message(message)
+		buddy = self._pservice.get_buddy_by_name(nick)
+		if buddy:
+			service = buddy.get_service_of_type(BuddyChat.SERVICE_TYPE)
+			self.open_chat(service)
+			#chat.recv_message(message)			
+		
+	def open_chat(self, service):
+		ActivityFactory.create("com.redhat.Sugar.ChatActivity")
diff --git a/shell/Shell.py b/shell/Shell.py
index ff668f0..2860ed0 100755
--- a/shell/Shell.py
+++ b/shell/Shell.py
@@ -14,6 +14,7 @@ from ConsoleWindow import ConsoleWindow
 from Owner import ShellOwner
 from PresenceService import PresenceService
 from ActivityHost import ActivityHost
+from ChatListener import ChatListener
 
 class ShellDbusService(dbus.service.Object):
 	def __init__(self, shell, bus_name):
@@ -57,6 +58,9 @@ class Shell:
 		self._owner = ShellOwner()
 		self._owner.announce()
 
+		chat_listener = ChatListener()
+		chat_listener.start()
+
 		self._home_window = HomeWindow(self)
 		self._home_window.show()