diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-11-29 14:46:38 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-12-01 10:39:49 +0000 |
| commit | befba7b0800b8f7ed197cedd55bb58d9d376f2fc (patch) | |
| tree | 2bc8289c1d25506dc57232b0f8bd1be9db8e70ef | |
| parent | 8526af7dc6f0f9ee0a71e36572af686eead45126 (diff) | |
| download | telepathy-haze-befba7b0800b8f7ed197cedd55bb58d9d376f2fc.tar.gz | |
Don't consider it to be an error if we accept/reject a nonexistent request
| -rw-r--r-- | src/contact-list.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/contact-list.c b/src/contact-list.c index 8686c9a..71bc591 100644 --- a/src/contact-list.c +++ b/src/contact-list.c @@ -907,7 +907,8 @@ haze_contact_list_accept_publish_request (HazeContactList *self, const gchar *bname = haze_connection_handle_inspect (self->priv->conn, TP_HANDLE_TYPE_CONTACT, handle); - g_return_if_fail (request_data != NULL); + if (request_data == NULL) + return; DEBUG ("allowing publish request for %s", bname); request_data->allow(request_data->data); @@ -933,7 +934,8 @@ haze_contact_list_reject_publish_request (HazeContactList *self, const gchar *bname = haze_connection_handle_inspect (self->priv->conn, TP_HANDLE_TYPE_CONTACT, handle); - g_return_if_fail (request_data != NULL); + if (request_data == NULL) + return; DEBUG ("denying publish request for %s", bname); request_data->deny(request_data->data); |