From 896fc422151107954ac7259d892e152bc912b05f Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 11 Sep 2007 16:03:14 +0000
Subject: Revert part of morgs' fix for current activity propagation.

This fixes "current-activity stealing" on Salut, which is bug#3328.

It turns out to be harmful to remove other buddies' current activity if it
matches an activity we just saw them leave, because during the join process,
we don't necessarily see everyone in the room straight away - so we may believe
that they momentarily left the room, then came back.

This should ideally be fixed in the connection managers, but a fix there is
much more involved.

Anyway, the other part of morgs' fix for current activity propagation
(removing *our* current activity if *we* leave) is necessary and sufficient,
and this one is redundant. The test cases in #3291 still work, except where
they're broken by #3294.
---
diff --git a/src/buddy.py b/src/buddy.py
index 0ea23e7..29f8385 100644
--- a/src/buddy.py
+++ b/src/buddy.py
@@ -474,10 +474,6 @@ class Buddy(ExportedGObject):
         """
         actid = activity.props.id
 
-        if self.props.current_activity == actid:
-            # set current activity to none
-            self.set_properties({_PROP_CURACT: None})
-
         if not self._activities.has_key(actid):
             return
         activity.disconnect(self._activity_sigids[actid])
--
cgit v0.9.1