Use two different activity types

tests/simulator/kiu.py

@@ -8,19 +8,19 @@ import os, random, gobject
 class KiuBot(Bot):
 	def __init__(self):
 		Bot.__init__(self, 'kiu', IconColor('#5E4505,#0F8A0F'))
-		self._olpc_channel_service = None
-		self._sugar_channel_service = None
+		self._olpc_chat_service = None
+		self._web_activity_service = None
 		self._activity_switch_timeout = None
 		self._curact = None
 
 		action = ShareActivityAction('OLPC channel',
 							 '_GroupChatActivity_Sugar_redhat_com._udp',
-							 self.__share_olpc_channel_cb)
+							 self.__share_olpc_chat_cb)
 		self.add_action(action, 10)
 
-		action = ShareActivityAction('Sugar channel',
-							 '_GroupChatActivity_Sugar_redhat_com._udp',
-							 self.__share_sugar_channel_cb)
+		action = ShareActivityAction('All About Giraffes',
+							 '_BrowserActivity_Sugar_redhat_com._udp',
+							 self.__share_web_activity_cb)
 		self.add_action(action, 20)
 
 		self._icon_file = os.path.abspath("kiu.jpg")
@@ -29,9 +29,9 @@ class KiuBot(Bot):
 		self._activity_switch_timeout = None
 		which = random.randint(1, 2)
 		if which == 1:
-			actid = self._olpc_channel_activity.get_id()
+			actid = self._olpc_chat_activity.get_id()
 		elif which == 2:
-			actid = self._sugar_channel_activity.get_id()
+			actid = self._web_activity.get_id()
 		else:
 			raise RuntimeError("WTF? unexpected value")
 		if actid != self._curact:
@@ -48,14 +48,14 @@ class KiuBot(Bot):
 		self._activity_switch_timeout = gobject.timeout_add(interval,
 				self.__activity_switch_cb)
 
-	def __share_olpc_channel_cb(self, sim_activity, service):
-		self._olpc_channel_service = service
-		self._olpc_channel_activity = sim_activity
+	def __share_olpc_chat_cb(self, sim_activity, service):
+		self._olpc_chat_service = service
+		self._olpc_chat_activity = sim_activity
 		self._schedule_activity_switch_timeout()
 
-	def __share_sugar_channel_cb(self, sim_activity, service):
-		self._sugar_channel_service = service
-		self._sugar_channel_activity = sim_activity
+	def __share_web_activity_cb(self, sim_activity, service):
+		self._web_activity_service = service
+		self._web_activity = sim_activity
 		self._schedule_activity_switch_timeout()
 
 def main():