[telepathy-salut/master] announce_self_caps: no need of the if branch

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Mon Mar 30 08:50:34 PDT 2009


---
 src/salut-connection.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/salut-connection.c b/src/salut-connection.c
index 86a7dbf..0582b9c 100644
--- a/src/salut-connection.c
+++ b/src/salut-connection.c
@@ -927,18 +927,15 @@ announce_self_caps (SalutConnection *self,
 {
   SalutConnectionPrivate *priv = SALUT_CONNECTION_GET_PRIVATE (self);
   gchar *caps_hash;
+  gboolean ret;
 
   caps_hash = caps_hash_compute_from_self_presence (priv->self);
 
-  if (!salut_self_set_caps (priv->self, GIBBER_TELEPATHY_NS_CAPS, "sha-1",
-        caps_hash, error))
-    {
-      g_free (caps_hash);
-      return FALSE;
-    }
+  ret = salut_self_set_caps (priv->self, GIBBER_TELEPATHY_NS_CAPS, "sha-1",
+        caps_hash, error);
 
   g_free (caps_hash);
-  return TRUE;
+  return ret;
 }
 
 static void
-- 
1.5.6.5




More information about the telepathy-commits mailing list