diff options
| -rw-r--r-- | addressbook/ChangeLog | 9 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 10c8089258..316709a5d1 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,14 @@ 2004-07-12 Chris Toshok <toshok@ximian.com> + [ fixes #61299 ] + + * gui/component/addressbook.c (addressbook_load_default_book): + don't pass @closure to load_source_cb, since that expects to get a + LoadSourceData*. also, don't always call e_book_async_open. only + do that when the book is non-NULL. + +2004-07-12 Chris Toshok <toshok@ximian.com> + [ part of fix for bug #56520 ] * gui/contact-list-editor/e-contact-list-editor.c diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index ec113b9578..32363c66be 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -280,7 +280,7 @@ addressbook_load_default_book (EBookCallback cb, gpointer closure) book = e_book_new_default_addressbook (NULL); if (!book) - load_source_cb (NULL, E_BOOK_ERROR_OTHER_ERROR, closure); /* XXX we should just use a GError and it's error code here */ - - e_book_async_open (book, FALSE, default_book_cb, load_source_data); + load_source_cb (NULL, E_BOOK_ERROR_OTHER_ERROR, load_source_data); /* XXX we should just use a GError and it's error code here */ + else + e_book_async_open (book, FALSE, default_book_cb, load_source_data); } |