diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-09-11 15:48:18 (GMT) |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-09-11 15:48:18 (GMT) |
| commit | dfbf41009bc9b843bb27107254d13d1cc21367dd (patch) | |
| tree | 91dca9ac4fb4d4aaee9fe3fb35e123a15e8a80f2 | |
| parent | 89ee8fd4ef51513fe236eead4c07a15be3059d51 (diff) | |
| parent | 1308b6fad475228047dacc3ed5dc4dbdabde21fe (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/presence-service
Also add (cassidy) to his latest NEWS entry.
Conflicts:
NEWS
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/presenceservice.py | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -1,5 +1,6 @@ * #3327: don't let a slower connection manager delete current activity advertised by a faster one (smcv) +* #2299: Be sure buddies keys are converted to string (cassidy) * #3291: Further improve activity participant tracking (smcv) * Correctly pick up existing Salut connections (smcv) * Don't crash if a buddy property is None (smcv) diff --git a/src/presenceservice.py b/src/presenceservice.py index 7ce94ba..8452410 100644 --- a/src/presenceservice.py +++ b/src/presenceservice.py @@ -186,7 +186,8 @@ class PresenceService(ExportedGObject): if buddy is not None and buddy is not self._owner: buddy.update_buddy_properties(tp, properties) m = conn[CONN_INTERFACE_BUDDY_INFO].connect_to_signal( - 'PropertiesChanged', buddy_properties_changed) + 'PropertiesChanged', buddy_properties_changed, + byte_arrays=True) self._conn_matches[conn].append(m) def buddy_curact_changed(contact, act_id, room): |