diff options
| author | Mike Ruprecht <mike.ruprecht@collabora.co.uk> | 2011-05-04 22:40:34 -0500 |
|---|---|---|
| committer | Mike Ruprecht <mike.ruprecht@collabora.co.uk> | 2011-05-04 22:40:34 -0500 |
| commit | 97f9f0576723448364ddd959f3fdc76affe6ca7f (patch) | |
| tree | 09ae816b0e689a775f72c64fb719a231bf6ac182 | |
| parent | fefef1e473f3ca188beb631458dd7a724d785b51 (diff) | |
| parent | 0d7199c228146e310ac498a748565f9275ef5fdd (diff) | |
Merge branch 'telepathy-glib-0.14'
| -rw-r--r-- | telepathy-glib/base-contact-list.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/telepathy-glib/base-contact-list.c b/telepathy-glib/base-contact-list.c index 34727983..c3e816c8 100644 --- a/telepathy-glib/base-contact-list.c +++ b/telepathy-glib/base-contact-list.c @@ -801,10 +801,8 @@ tp_base_contact_list_simple_finish (TpBaseContactList *self, { GSimpleAsyncResult *simple = (GSimpleAsyncResult *) result; - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (result), FALSE); - g_return_val_if_fail (g_async_result_get_source_object (result) == - (GObject *) self, FALSE); - /* not using _is_valid here because we want to be source-tag-agnostic */ + g_return_val_if_fail (g_simple_async_result_is_valid ( + result, G_OBJECT (self), NULL), FALSE); return !g_simple_async_result_propagate_error (simple, error); } |