Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <cassidy@cass-wks.(none)>2007-11-12 14:30:24 (GMT)
committer Guillaume Desmottes <cassidy@cass-wks.(none)>2007-11-12 14:30:24 (GMT)
commitad3e09e68b6dc1dcc98479f2a225378a50bf1f72 (patch)
tree0757c90ebab5396021f36ae8caa15231db45a3df
parent25c30c917899ee8b00ce56d7500abf62b90fded0 (diff)
Fix regression when sharing an activity (#4660)
-rw-r--r--NEWS2
-rw-r--r--src/presenceservice.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 661d8e4..cb991d4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+* #4660: Fix regression when sharing an activity
+
Snapshot 43d1d48b27
* #4692: Don't put activity sharer in 'private' property (correcting a wrong
diff --git a/src/presenceservice.py b/src/presenceservice.py
index c179618..30c6dab 100644
--- a/src/presenceservice.py
+++ b/src/presenceservice.py
@@ -794,8 +794,8 @@ class PresenceService(ExportedGObject):
activity = Activity(self._session_bus, objid, self,
self._get_preferred_plugin(), 0,
id=actid, type=atype,
- name=name, color=color, local=True,
- private=True, tags=tags)
+ name=name, color=self._owner.props.color,
+ local=True, private=True, tags=tags)
activity.connect("validity-changed",
self._activity_validity_changed_cb)