[next] telepathy-gabble: construct_contact_statuses_cb: assert that handles are valid

Guillaume Desmottes gdesmott at kemper.freedesktop.org
Wed Oct 16 10:38:43 PDT 2013


Module: telepathy-gabble
Branch: next
Commit: d3f72cf6986452531d85bef2c2467675db079f66
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=d3f72cf6986452531d85bef2c2467675db079f66

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Wed Oct 16 12:04:19 2013 -0400

construct_contact_statuses_cb: assert that handles are valid

tp-glib checks that for us.

---

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

diff --git a/src/conn-presence.c b/src/conn-presence.c
index 6d1a235..ab9585f 100644
--- a/src/conn-presence.c
+++ b/src/conn-presence.c
@@ -185,8 +185,8 @@ construct_contact_statuses_cb (GObject *obj,
   TpHandleRepoIface *handle_repo = tp_base_connection_get_handles (base,
       TP_HANDLE_TYPE_CONTACT);
 
-  if (!tp_handles_are_valid (handle_repo, contact_handles, FALSE, NULL))
-    return NULL;
+  g_return_val_if_fail (tp_handles_are_valid (handle_repo, contact_handles,
+        FALSE, NULL), NULL);
 
   contact_statuses = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL,
       (GDestroyNotify) tp_presence_status_free);



More information about the telepathy-commits mailing list