diff options
| author | Simon Schampijer <simon@schampijer.de> | 2010-09-22 10:24:08 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2010-09-22 10:24:08 (GMT) |
| commit | bc7caa2802da141d80128700017ac3cc7c2841b6 (patch) | |
| tree | 5dc21aa989bcd10d93f83e53eb6fa992271d6e5a | |
| parent | 4726bd0448cd8b64528f05be665b906ad8e6238a (diff) | |
| parent | b9954cd6a95bb2e0845f2608c8870de368c7bdd0 (diff) | |
Merge branch 'sucrose-0.84' of gitorious@git.sugarlabs.org:sugar-presence-service/mainline into sucrose-0.84
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/activity.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index abab6ec..6d9cd49 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([Sugar Presence Service],[0.84.0],[],[sugar-presence-service]) +AC_INIT([Sugar Presence Service],[0.84.1],[],[sugar-presence-service]) AC_PREREQ([2.59]) diff --git a/src/activity.py b/src/activity.py index 12f3ac2..29ba1a5 100644 --- a/src/activity.py +++ b/src/activity.py @@ -1120,6 +1120,8 @@ class Activity(ExportedGObject): self._buddy_to_handle[buddy] = handle self._add_buddies(added_buddies.itervalues()) + self._claimed_buddies |= set(added_buddies.itervalues()) + # we treat all pending members as if they weren't there removed = set(removed) removed |= set(local_pending) |