summaryrefslogtreecommitdiff
path: root/telepathy-glib/capabilities.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-01 10:08:04 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-01 10:08:04 +0200
commit70369078bfc145c374f5030c581c91096a1b4863 (patch)
treebf032b0ae21b57dade8c25a36d53e915f602c3f0 /telepathy-glib/capabilities.c
parent199835fe99584ff549f9f1beb6b9d91d3fa83773 (diff)
parent6a14af51d0c216b058c4da767a7f17eef43b819d (diff)
downloadtelepathy-glib-70369078bfc145c374f5030c581c91096a1b4863.tar.gz
Merge branch 'telepathy-glib-0.12'
Diffstat (limited to 'telepathy-glib/capabilities.c')
-rw-r--r--telepathy-glib/capabilities.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/telepathy-glib/capabilities.c b/telepathy-glib/capabilities.c
index e0f823216..50399ea4a 100644
--- a/telepathy-glib/capabilities.c
+++ b/telepathy-glib/capabilities.c
@@ -104,7 +104,7 @@ tp_capabilities_get_channel_classes (TpCapabilities *self)
gboolean
tp_capabilities_is_specific_to_contact (TpCapabilities *self)
{
- g_return_val_if_fail (self != NULL, FALSE);
+ g_return_val_if_fail (TP_IS_CAPABILITIES (self), FALSE);
return self->priv->contact_specific;
}
@@ -275,6 +275,8 @@ supports_simple_channel (TpCapabilities *self,
{
guint i;
+ g_return_val_if_fail (TP_IS_CAPABILITIES (self), FALSE);
+
for (i = 0; i < self->priv->classes->len; i++)
{
GValueArray *arr = g_ptr_array_index (self->priv->classes, i);