[evolution/wip/gsettings] Bug #638391 - Always passing NULL to emu_addr_cancel_book()
- From: Rodrigo Moya <rodrigo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/gsettings] Bug #638391 - Always passing NULL to emu_addr_cancel_book()
- Date: Wed, 29 Jun 2011 17:11:08 +0000 (UTC)
commit d15d6e8e4144e852788334e5fdaea5180ff48725
Author: Milan Crha <mcrha redhat com>
Date: Wed Feb 16 16:30:35 2011 +0100
Bug #638391 - Always passing NULL to emu_addr_cancel_book()
mail/em-utils.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/mail/em-utils.c b/mail/em-utils.c
index cea8871..2fdee28 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -1580,12 +1580,16 @@ emu_addr_setup (gpointer user_data)
static void
emu_addr_cancel_book (gpointer data)
{
- EBook *book = data;
+ EBook **pbook = data;
GError *err = NULL;
- /* we dunna care if this fails, its just the best we can try */
- e_book_cancel (book, &err);
- g_clear_error (&err);
+ g_return_if_fail (pbook != NULL);
+
+ if (*pbook) {
+ /* we dunna care if this fails, its just the best we can try */
+ e_book_cancel (*pbook, &err);
+ g_clear_error (&err);
+ }
}
static void
@@ -1750,7 +1754,7 @@ search_address_in_addressbooks (const gchar *address, gboolean local_only, gbool
d(printf(" checking '%s'\n", e_source_get_uri(source)));
- hook_book = mail_cancel_hook_add (emu_addr_cancel_book, book);
+ hook_book = mail_cancel_hook_add (emu_addr_cancel_book, &book);
hook_stop = mail_cancel_hook_add (emu_addr_cancel_stop, &stop);
book = g_hash_table_lookup (emu_books_hash, e_source_peek_uid (source));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]