diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-08-16 19:21:58 +0800 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-08-16 19:22:01 +0800 |
| commit | 897bfbce7f3333362e2dd16bb5e4986aa8fa64cd (patch) | |
| tree | c56855ccef47b281988ebacbb91f6a726cbaeb84 /libempathy | |
| parent | b5f6788106bbd8c3e06fef09edb533812114afa7 (diff) | |
| parent | 6ac9f42fa93a79064c4b69828cc8354114f1b2f0 (diff) | |
| download | gsoc2013-empathy-897bfbce7f3333362e2dd16bb5e4986aa8fa64cd.tar gsoc2013-empathy-897bfbce7f3333362e2dd16bb5e4986aa8fa64cd.tar.gz gsoc2013-empathy-897bfbce7f3333362e2dd16bb5e4986aa8fa64cd.tar.bz2 gsoc2013-empathy-897bfbce7f3333362e2dd16bb5e4986aa8fa64cd.tar.lz gsoc2013-empathy-897bfbce7f3333362e2dd16bb5e4986aa8fa64cd.tar.xz gsoc2013-empathy-897bfbce7f3333362e2dd16bb5e4986aa8fa64cd.tar.zst gsoc2013-empathy-897bfbce7f3333362e2dd16bb5e4986aa8fa64cd.zip | |
Merge branch 'blockade'
https://bugzilla.gnome.org/show_bug.cgi?id=656167
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-tp-contact-list.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c index d947e7284..11990a9a2 100644 --- a/libempathy/empathy-tp-contact-list.c +++ b/libempathy/empathy-tp-contact-list.c @@ -821,7 +821,19 @@ list_get_contact_blocking_capabilities_cb (TpProxy *conn, EmpathyTpContactListPriv *priv = GET_PRIV (list); TpContactBlockingCapabilities caps; - g_return_if_fail (G_VALUE_HOLDS_UINT (value)); + if (in_error != NULL) { + DEBUG ("Get(Blocking, ContactBlockingCapabilities) on %s failed: %s", + tp_proxy_get_object_path (conn), + in_error->message); + return; + } + + if (!G_VALUE_HOLDS_UINT (value)) { + DEBUG ("Get(Blocking, ContactBlockingCapabilities) on %s returned a %s, not a uint", + tp_proxy_get_object_path (conn), + G_VALUE_TYPE_NAME (value)); + return; + } caps = g_value_get_uint (value); |