diff options
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | 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,5 +1,11 @@ 2003-05-19 Chris Toshok <toshok@ximian.com> + * 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 <toshok@ximian.com> + * gui/component/addressbook-component.c (ensure_completion_uris_exist): fix the initial run case. the config upgrade code creates all elements so we can't just check 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); } |