[telepathy-gabble/master] gabble_presence_cache_add_bundle_caps: remove bitfield argument

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Aug 24 12:47:50 PDT 2009


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

diff --git a/src/capabilities.c b/src/capabilities.c
index 211476d..75c4ca8 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -299,8 +299,7 @@ capabilities_fill_cache (GabblePresenceCache *cache)
    * XMPP does not require to cache this bundle but some old versions of
    * 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, NS_GOOGLE_FEAT_VOICE);
+    "http://www.google.com/xmpp/client/caps#voice-v1", NS_GOOGLE_FEAT_VOICE);
 }
 
 const CapabilityConversionData capabilities_conversions[] =
diff --git a/src/presence-cache.c b/src/presence-cache.c
index aba0faa..191929c 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -1565,7 +1565,7 @@ gabble_presence_cache_update_many (
 }
 
 void gabble_presence_cache_add_bundle_caps (GabblePresenceCache *cache,
-    const gchar *node, GabblePresenceCapabilities new_caps,
+    const gchar *node,
     const gchar *namespace)
 {
   CapabilityInfo *info;
diff --git a/src/presence-cache.h b/src/presence-cache.h
index 1a05912..4fac4fb 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 *ns);
+    const gchar *node, const gchar *ns);
 void gabble_presence_cache_really_remove (GabblePresenceCache *cache,
     TpHandle handle);
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list