diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-06-22 20:01:14 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-06-22 20:01:14 (GMT) |
| commit | c234b7b4a396ce523692d5516c3cc4fb159d9d0c (patch) | |
| tree | 47f1ce749cdf31abc7b06ba6ad1b3fb493d465b5 /activities | |
| parent | 0a305004b08cab01c1ae42a069d77b1517491f99 (diff) | |
| parent | be992586b1e0d849a732b44eed7047dd8be62501 (diff) | |
Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar
Conflicts:
sugar/presence/Buddy.py
Diffstat (limited to 'activities')
| -rw-r--r-- | activities/browser/BrowserActivity.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activities/browser/BrowserActivity.py b/activities/browser/BrowserActivity.py index 2f851dd..e49cfb4 100644 --- a/activities/browser/BrowserActivity.py +++ b/activities/browser/BrowserActivity.py @@ -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): |