[telepathy-gabble/master] gabble_presence_dup_caps: don't union bitfield caps into the set of namespaces

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Aug 24 10:07:54 PDT 2009


They should all be there already, now.
---
 src/presence.c |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/src/presence.c b/src/presence.c
index 8f282f7..3bb5cc5 100644
--- a/src/presence.c
+++ b/src/presence.c
@@ -171,17 +171,8 @@ gabble_presence_has_cap (GabblePresence *presence,
 GabbleCapabilitySet *
 gabble_presence_dup_caps (GabblePresence *presence)
 {
-  GabbleCapabilitySet *ret, *tmp;
-
   g_return_val_if_fail (presence != NULL, NULL);
-
-  ret = gabble_capability_set_copy (presence->priv->cap_set);
-
-  tmp = gabble_capability_set_new_from_flags (presence->priv->caps);
-  gabble_capability_set_update (ret, tmp);
-  gabble_capability_set_free (tmp);
-
-  return ret;
+  return gabble_capability_set_copy (presence->priv->cap_set);
 }
 
 const gchar *
-- 
1.5.6.5




More information about the telepathy-commits mailing list