From dfbf41009bc9b843bb27107254d13d1cc21367dd Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 11 Sep 2007 15:48:18 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/presence-service

Also add (cassidy) to his latest NEWS entry.

Conflicts:

	NEWS
---
diff --git a/NEWS b/NEWS
index d6841bd..9021999 100644
--- a/NEWS
+++ b/NEWS
@@ -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):
--
cgit v0.9.1