[telepathy-gabble/master] Remove some useless uses of caps in debug
Simon McVittie
simon.mcvittie at collabora.co.uk
Mon Aug 24 10:26:42 PDT 2009
gabble_presence_set_capabilities already debugs the caps list, so we don't
need to be so noisy elsewhere.
---
src/connection.c | 6 +-----
src/presence-cache.c | 9 ++-------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/connection.c b/src/connection.c
index 7a4379f..15b20ba 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1691,8 +1691,7 @@ connection_iq_disco_cb (LmMessageHandler *handler,
if (node)
lm_message_node_set_attribute (result_query, "node", node);
- DEBUG ("got disco request for node %s, caps are %x", node,
- gabble_presence_get_caps_bitfield (self->self_presence));
+ DEBUG ("got disco request for node %s", node);
/* Every entity MUST have at least one identity (XEP-0030). Gabble publishs
* one identity. If you change the identity here, you also need to change
@@ -2459,8 +2458,6 @@ gabble_connection_advertise_capabilities (TpSvcConnectionInterfaceCapabilities *
TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (base, context);
- DEBUG ("caps before: %x", gabble_presence_get_caps_bitfield (pres));
-
add_set = gabble_capability_set_new ();
remove_set = gabble_capability_set_new ();
@@ -2510,7 +2507,6 @@ gabble_connection_advertise_capabilities (TpSvcConnectionInterfaceCapabilities *
DEBUG ("before != after, changing");
gabble_presence_set_capabilities (pres, priv->resource, cap_set,
capabilities_parse (cap_set), priv->caps_serial++);
- DEBUG ("set caps: %x", gabble_presence_get_caps_bitfield (pres));
}
ret = g_ptr_array_new ();
diff --git a/src/presence-cache.c b/src/presence-cache.c
index 4c43c28..d83b30e 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -870,15 +870,12 @@ set_caps_for (DiscoWaiter *waiter,
save_caps = gabble_presence_get_caps_bitfield (presence);
old_cap_set = gabble_presence_dup_caps (presence);
- DEBUG ("setting caps for %d (thanks to %d %s) to %d (save_caps %d)",
- waiter->handle, responder_handle, responder_jid, caps, save_caps);
+ DEBUG ("setting caps for %d (thanks to %d %s)",
+ waiter->handle, responder_handle, responder_jid);
gabble_presence_set_capabilities (presence, waiter->resource, cap_set,
caps, waiter->serial);
- DEBUG ("caps for %d now %d", waiter->handle,
- gabble_presence_get_caps_bitfield (presence));
-
new_cap_set = gabble_presence_dup_caps (presence);
emit_capabilities_update (cache, waiter->handle, old_cap_set, new_cap_set);
@@ -1092,8 +1089,6 @@ _process_caps_uri (GabblePresenceCache *cache,
{
gabble_presence_set_capabilities (presence, resource, info->cap_set,
capabilities_parse (info->cap_set), serial);
- DEBUG ("caps for %d (%s) now %d", handle, from,
- gabble_presence_get_caps_bitfield (presence));
}
else
{
--
1.5.6.5
More information about the telepathy-commits
mailing list