sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar

Browse Source 
Conflicts:

	sugar/presence/Buddy.py
This commit is contained in:
Marco Pesenti Gritti
2006-06-22 16:01:14 -04:00
parent 0a305004b0 be992586b1
commit c234b7b4a3
10 changed files with 224 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
activities/browser/BrowserActivity.py
+2 -2
View File
@@ -35,7 +35,7 @@ class BrowserActivity(Activity):
def _service_appeared_cb(self, pservice, buddy, service):
# Make sure the service is for our activity
if service.get_activity_uid() != self._activity_id:
if service.get_activity_id() != self._activity_id:
return
if service.get_type() == _BROWSER_ACTIVITY_TYPE:
@@ -116,7 +116,7 @@ class BrowserActivity(Activity):
# Join the shared activity if we were started from one
if self._initial_service:
logging.debug("BrowserActivity joining shared activity %s" % self._initial_service.get_activity_uid())
logging.debug("BrowserActivity joining shared activity %s" % self._initial_service.get_activity_id())
self._pservice.join_shared_activity(self._initial_service)
def get_embed(self):