summaryrefslogtreecommitdiff
path: root/telepathy-glib/base-client.c
diff options
context:
space:
mode:
Diffstat (limited to 'telepathy-glib/base-client.c')
-rw-r--r--telepathy-glib/base-client.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index 1643be178..767ddc2af 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -1062,9 +1062,11 @@ tp_base_client_dup_handled_channels (TpBaseClient *self)
g_return_val_if_fail (self->priv->flags & CLIENT_IS_HANDLER, NULL);
- set = g_hash_table_new (g_str_hash, g_str_equal);
-
clients = g_object_get_qdata (G_OBJECT (self->priv->dbus), clients_quark ());
+ if (clients == NULL)
+ return NULL;
+
+ set = g_hash_table_new (g_str_hash, g_str_equal);
g_hash_table_iter_init (&iter, clients);
while (g_hash_table_iter_next (&iter, NULL, &value))