diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-10-31 17:05:39 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-10-31 17:05:39 +0100 |
| commit | dfe6f80cf4e73d60d06fbe67b1f9c6ef0af4d545 (patch) | |
| tree | ae220731e6ca3b9919798b6608e74cf97fcda938 | |
| parent | fa115d82e775075a9c9dbc7923ff5c375947378b (diff) | |
| parent | 6e9c139d4a3b84e368d8f45592189d244fc59e32 (diff) | |
Merge branch 'telepathy-glib-0.16'
| -rw-r--r-- | telepathy-glib/connection-contact-list.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/telepathy-glib/connection-contact-list.c b/telepathy-glib/connection-contact-list.c index 532e955e..daf28a6d 100644 --- a/telepathy-glib/connection-contact-list.c +++ b/telepathy-glib/connection-contact-list.c @@ -769,10 +769,13 @@ generic_callback (TpConnection *self, G_STMT_START { \ GSimpleAsyncResult *result; \ GArray *handles; \ + gboolean supplied_contacts_are_valid; \ \ g_return_if_fail (TP_IS_CONNECTION (self)); \ - g_return_if_fail (_tp_contacts_to_handles (self, n_contacts, contacts, \ - &handles)); \ + \ + supplied_contacts_are_valid = _tp_contacts_to_handles (self, n_contacts, \ + contacts, &handles); \ + g_return_if_fail (supplied_contacts_are_valid); \ \ result = g_simple_async_result_new ((GObject *) self, callback, user_data, \ tp_connection_##method##_async); \ @@ -1109,11 +1112,14 @@ tp_connection_get_contact_groups (TpConnection *self) G_STMT_START { \ GSimpleAsyncResult *result; \ GArray *handles; \ + gboolean supplied_contacts_are_valid; \ \ g_return_if_fail (TP_IS_CONNECTION (self)); \ g_return_if_fail (group != NULL); \ - g_return_if_fail (_tp_contacts_to_handles (self, n_contacts, contacts, \ - &handles)); \ + \ + supplied_contacts_are_valid = _tp_contacts_to_handles (self, n_contacts, \ + contacts, &handles); \ + g_return_if_fail (supplied_contacts_are_valid); \ \ result = g_simple_async_result_new ((GObject *) self, callback, user_data, \ tp_connection_##method##_async); \ |