diff options
| author | Simon Schampijer <simon@schampijer.de> | 2011-06-24 09:49:39 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2011-07-24 14:00:14 (GMT) |
| commit | fd857d85d711ce8f80ef09aba492cad0c773d40b (patch) | |
| tree | 3dd21e2bbcc747cb247243cae40516601fd94b54 /src | |
| parent | 5598b9f81a8fcc6ed73caaa338a2366fd7422ed9 (diff) | |
Friendstray: make sure the tray is right on the sharer side OLPC #10817
The code path that listens for the 'activity-added' signal is used to
track the following use case: 'A' starts an activity
(he gets the 'active-activity-changed' signal from the shell), he then
at a later point shares the activity. In order to track joining/leaving
buddies he needs to get the shared activity. On other machines if we
receive the 'activity-added' signal we can ignore it, therefore the
check if the current active activity is the shared one.
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-By: Sascha Silbe <silbe@activitycentral.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/jarabe/frame/friendstray.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/jarabe/frame/friendstray.py b/src/jarabe/frame/friendstray.py index 31a9809..4055340 100644 --- a/src/jarabe/frame/friendstray.py +++ b/src/jarabe/frame/friendstray.py @@ -75,6 +75,10 @@ class FriendsTray(VTray): def __neighborhood_activity_added_cb(self, neighborhood_model, shared_activity): logging.debug('FriendsTray.__neighborhood_activity_added_cb') + active_activity = shell.get_model().get_active_activity() + if active_activity.get_activity_id() != shared_activity.activity_id: + return + self.clear() # always display ourselves |