From c583bd763820ba32727c9ef20ba682745bfdd51a Mon Sep 17 00:00:00 2001
From: Morgan Collett <morgan.collett@gmail.com>
Date: Thu, 13 Mar 2008 19:34:37 +0000
Subject: #6690: Fix sync_friends mangling the JIDs

---
diff --git a/src/server_plugin.py b/src/server_plugin.py
index f862ce4..c81a936 100644
--- a/src/server_plugin.py
+++ b/src/server_plugin.py
@@ -374,14 +374,7 @@ class ServerPlugin(TelepathyPlugin):
         friends_handles = set()
         friends = set()
         for key in keys:
-            try:
-               decoded = base64.b64decode(key)
-            except TypeError:
-                # key is invalid; skip this friend
-                _logger.debug('skipping friend with invalid key')
-                continue
-
-            id = psutils.pubkey_to_keyid(decoded)
+            id = psutils.pubkey_to_keyid(key)
             # this assumes that all our friends are on the same server as us
             jid = '%s@%s' % (id, profile.jabber_server)
             friends.add(jid)
--
cgit v0.9.1