[telepathy-gabble/master] gabble_presence_cache_add_bundle_caps: add the namespace as well as the flag

[Simon McVittie]

---
 src/capabilities.c   |    2 +-
 src/presence-cache.c |    4 +++-
 src/presence-cache.h |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/capabilities.c b/src/capabilities.c
index ff9d339..8e3c099 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -287,7 +287,7 @@ capabilities_fill_cache (GabblePresenceCache *cache)
    * Google Talk do not reply correctly to discovery requests. */
   gabble_presence_cache_add_bundle_caps (cache,
     "http://www.google.com/xmpp/client/caps#voice-v1",
-    PRESENCE_CAP_GOOGLE_VOICE);
+    PRESENCE_CAP_GOOGLE_VOICE, NS_GOOGLE_FEAT_VOICE);
 }
 
 GabblePresenceCapabilities
diff --git a/src/presence-cache.c b/src/presence-cache.c
index fee574f..fa5d84a 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -1566,13 +1566,15 @@ gabble_presence_cache_update_many (
 }
 
 void gabble_presence_cache_add_bundle_caps (GabblePresenceCache *cache,
-    const gchar *node, GabblePresenceCapabilities new_caps)
+    const gchar *node, GabblePresenceCapabilities new_caps,
+    const gchar *namespace)
 {
   CapabilityInfo *info;
 
   info = capability_info_get (cache, node);
   info->trust = CAPABILITY_BUNDLE_ENOUGH_TRUST;
   info->caps |= new_caps;
+  gabble_capability_set_add (info->cap_set, namespace);
 }
 
 void
diff --git a/src/presence-cache.h b/src/presence-cache.h
index 1a9fd82..1a05912 100644
--- a/src/presence-cache.h
+++ b/src/presence-cache.h
@@ -81,7 +81,7 @@ void gabble_presence_cache_update_many (GabblePresenceCache *cache,
 void gabble_presence_cache_maybe_remove (GabblePresenceCache *cache,
     TpHandle handle);
 void gabble_presence_cache_add_bundle_caps (GabblePresenceCache *cache,
-    const gchar *node, GabblePresenceCapabilities caps);
+    const gchar *node, GabblePresenceCapabilities caps, const gchar *ns);
 void gabble_presence_cache_really_remove (GabblePresenceCache *cache,
     TpHandle handle);
 
-- 
1.5.6.5