Merge

sugar/browser/BrowserActivity.py

@@ -11,7 +11,7 @@ from sugar.browser import NavigationToolbar
 from sugar.presence.PresenceService import PresenceService
 
 
-_BROWSER_ACTIVITY_TYPE = "_web_browser_olpc._udp"
+_BROWSER_ACTIVITY_TYPE = "_web_olpc._udp"
 _SERVICE_URI_TAG = "URI"
 _SERVICE_TITLE_TAG = "Title"
 

sugar/shell/StartPage.py

@@ -100,6 +100,7 @@ class StartPage(gtk.HBox):
 	def _on_new_service_adv_cb(self, pservice, uid, stype):
 		if uid is not None:
 			real_stype = Service.compose_service_type(stype, uid)
+			print "Will ask to track uid=%s, stype=%s" % (uid, stype)
 			self._pservice.track_service_type(real_stype)
 
 	def _on_activity_announced_cb(self, pservice, service, buddy):