From ad3e09e68b6dc1dcc98479f2a225378a50bf1f72 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <cassidy@cass-wks.(none)>
Date: Mon, 12 Nov 2007 14:30:24 +0000
Subject: Fix regression when sharing an activity (#4660)

---
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)
--
cgit v0.9.1