From 6052618948ddc67076b41c4fe9b14f44ad9a727b Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Mon, 19 May 2003 20:26:34 +0000 Subject: handle the case where @book == NULL, which can happen if there was a 2003-05-19 Chris Toshok * backend/ebook/e-destination.c (use_default_book_cb): handle the case where @book == NULL, which can happen if there was a problem opening the default book. Should fix #43005. svn path=/trunk/; revision=21269 --- addressbook/ChangeLog | 6 ++++++ addressbook/backend/ebook/e-destination.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index e7589fad72..71cb31aa2a 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2003-05-19 Chris Toshok + + * backend/ebook/e-destination.c (use_default_book_cb): handle the + case where @book == NULL, which can happen if there was a problem + opening the default book. Should fix #43005. + 2003-05-19 Chris Toshok * gui/component/addressbook-component.c diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c index 7ea2f5690f..7ddae75b48 100644 --- a/addressbook/backend/ebook/e-destination.c +++ b/addressbook/backend/ebook/e-destination.c @@ -1039,12 +1039,15 @@ static void use_default_book_cb (EBook *book, gpointer closure) { EDestination *dest = E_DESTINATION (closure); - if (dest->priv->cardify_book == NULL) { + if (book != NULL && dest->priv->cardify_book == NULL) { dest->priv->cardify_book = book; g_object_ref (book); } - launch_cardify_query (dest); + if (dest->priv->cardify_book) + launch_cardify_query (dest); + else + g_object_unref (dest); } -- cgit v1.2.3