From 8c2cfd344aa9a98ea3a1629a3642820134e94d6b Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Mon, 17 May 2010 12:17:02 -0300 Subject: [PATCH] obexd: Returns OBEX service unavailable when ebook async get contacts fails PullvCardListing shall return OBEX error service unavailable when ebook can process a valid contact query. Given the available error codes for PBAP, service unvailable is the code more suitable for this scenario. --- obexd/plugins/phonebook-ebook.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/obexd/plugins/phonebook-ebook.c b/obexd/plugins/phonebook-ebook.c index 903ca58c6..0ca1cba25 100644 --- a/obexd/plugins/phonebook-ebook.c +++ b/obexd/plugins/phonebook-ebook.c @@ -449,8 +449,11 @@ int phonebook_create_cache(const char *name, phonebook_entry_cb entry_cb, data->user_data = user_data; ret = e_book_async_get_contacts(ebook, query, cache_cb, data); - e_book_query_unref(query); + if (ret == FALSE) { + g_free(data); + return -EFAULT; + } - return ret == FALSE ? 0 : -EBADR; + return 0; } -- 2.47.3