Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/activity.py
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2007-09-10 13:26:47 (GMT)
committer Simon McVittie <simon.mcvittie@collabora.co.uk>2007-09-10 13:26:47 (GMT)
commit5703431facf7fea1839c9f2a7424d2e49d32e613 (patch)
tree56b8abc8ae88a1371736c39a99ba1273e8a7cfb2 /src/activity.py
parent0bfd05c2663b66a2d36585394aaeb0d44d01e6c8 (diff)
parent7b3428886baa8f5c33daa0622446c1e47039d140 (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/presence-service
Diffstat (limited to 'src/activity.py')
-rw-r--r--src/activity.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/activity.py b/src/activity.py
index 7dc59dc..c5f951c 100644
--- a/src/activity.py
+++ b/src/activity.py
@@ -720,6 +720,8 @@ class Activity(ExportedGObject):
if self._join_is_sharing:
self.send_properties()
self._ps.owner.add_activity(self)
+ else:
+ self._ps.owner.set_properties({'current-activity': self.props.id})
self._join_cb()
_logger.debug("%s of activity %s succeeded" % (verb, self._id))
except Exception, e: