[telepathy-gabble/master] Don't break contact caps on non-SHA-1 hashes

[Will Thompson]

XEP-0115 doesn't say that clients have to report SHA-1 hashes, only that
they have to understand them. So this would break contact caps for a
client which has decided to use SHA-256.
---
 src/presence-cache.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/presence-cache.c b/src/presence-cache.c
index ec7b528..8b9ad3a 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -1029,14 +1029,8 @@ _caps_disco_cb (GabbleDisco *disco,
   else
     {
       trust_inc = 1;
-      trust = capability_info_recvd (cache, node, handle, caps, NULL,
-          trust_inc);
-
-      /* Do not allow tubes caps if the contact does not observe XEP-0115
-       * version 1.5: we don't need to bother being compatible with both version
-       * 1.3 and tubes caps */
-      gabble_presence_cache_free_cache_entry (per_channel_manager_caps);
-      per_channel_manager_caps = NULL;
+      trust = capability_info_recvd (cache, node, handle, caps,
+          per_channel_manager_caps, trust_inc);
     }
 
   for (i = waiters; NULL != i;)
-- 
1.5.6.5