[telepathy-gabble/master] gabble_connection_advertise_capabilities: avoid calling c2tf_fn twice

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Aug 24 06:18:20 PDT 2009


---
 src/connection.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 7034672..5787b46 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -2528,7 +2528,9 @@ gabble_connection_advertise_capabilities (TpSvcConnectionInterfaceCapabilities *
 
   for (ccd = capabilities_conversions; NULL != ccd->iface; ccd++)
     {
-      if (ccd->c2tf_fn (pres->caps))
+      guint tp_caps = ccd->c2tf_fn (pres->caps);
+
+      if (tp_caps != 0)
         {
           GValue iface_flags_pair = {0, };
 
@@ -2539,7 +2541,7 @@ gabble_connection_advertise_capabilities (TpSvcConnectionInterfaceCapabilities *
 
           dbus_g_type_struct_set (&iface_flags_pair,
                                   0, ccd->iface,
-                                  1, ccd->c2tf_fn (pres->caps),
+                                  1, tp_caps,
                                   G_MAXUINT);
 
           g_ptr_array_add (ret, g_value_get_boxed (&iface_flags_pair));
-- 
1.5.6.5



More information about the telepathy-commits mailing list