From 20afcfa47569d10adf7522ff025e7f9b67f6432e Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Thu, 15 Jun 2006 18:28:21 -0400 Subject: [PATCH] Merge --- sugar/browser/BrowserActivity.py | 2 +- sugar/shell/StartPage.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sugar/browser/BrowserActivity.py b/sugar/browser/BrowserActivity.py index f713bf5d..371a62e5 100644 --- a/sugar/browser/BrowserActivity.py +++ b/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" diff --git a/sugar/shell/StartPage.py b/sugar/shell/StartPage.py index 92102104..f51b5661 100644 --- a/sugar/shell/StartPage.py +++ b/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):