[telepathy-mission-control/master] McdDispatcher: remove a pointlessly defensive check

Simon McVittie simon.mcvittie at collabora.co.uk
Thu Sep 10 11:47:20 PDT 2009


When we're using a TpHandleRepoIface as a simple string pool, the returned
handle is always nonzero, because there's no concept of an invalid string.

As per wjt's review.
---
 src/mcd-dispatcher.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 1bbf004..8f24790 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -2171,11 +2171,8 @@ mcd_client_add_cap_tokens (McdClient *client,
         TpHandle handle = tp_handle_ensure (dispatcher->priv->string_pool,
                                             cap_tokens[i], NULL, NULL);
 
-        if (handle != 0)
-        {
-            tp_handle_set_add (client->capability_tokens, handle);
-            tp_handle_unref (dispatcher->priv->string_pool, handle);
-        }
+        tp_handle_set_add (client->capability_tokens, handle);
+        tp_handle_unref (dispatcher->priv->string_pool, handle);
     }
 }
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list