Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2007-05-30 16:38:58 (GMT)
committer Simon McVittie <simon.mcvittie@collabora.co.uk>2007-05-30 16:38:58 (GMT)
commitfd4e514e21f6cc5009c45d166b1714ff9c9c4aac (patch)
tree6f555aeb261e9fa525965c77cd110b5a167d54d1 /services
parentee6c1b428389268892889bc634650429c61b38b8 (diff)
services/presence/buddy: Fix thinko - register Owner with correct objid
Previously the keyid/ prefix was missing.
Diffstat (limited to 'services')
-rw-r--r--services/presence/buddy.py3
-rw-r--r--services/presence/pstest.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/services/presence/buddy.py b/services/presence/buddy.py
index b858b41..82a9b44 100644
--- a/services/presence/buddy.py
+++ b/services/presence/buddy.py
@@ -589,7 +589,8 @@ class ShellOwner(GenericOwner):
icon = f.read()
f.close()
- GenericOwner.__init__(self, ps, bus, psutils.pubkey_to_keyid(key),
+ GenericOwner.__init__(self, ps, bus,
+ 'keyid/' + psutils.pubkey_to_keyid(key),
key=key, nick=nick, color=color, icon=icon, server=server,
key_hash=key_hash, registered=registered)
diff --git a/services/presence/pstest.py b/services/presence/pstest.py
index 3054e48..7715fd3 100644
--- a/services/presence/pstest.py
+++ b/services/presence/pstest.py
@@ -63,7 +63,8 @@ class TestOwner(GenericOwner):
icon = _get_random_image()
_logger.debug("pubkey is %s" % pubkey)
- GenericOwner.__init__(self, ps, bus, pubkey_to_keyid(pubkey),
+ GenericOwner.__init__(self, ps, bus,
+ 'keyid/' + pubkey_to_keyid(pubkey),
key=pubkey, nick=nick, color=color, icon=icon,
registered=registered, key_hash=privkey_hash)