From aeec7106f7a3d6d1e4479c2ec596a506c4c281fa Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Fri, 7 Feb 2003 07:14:34 +0000 Subject: check the status, not the book, and unref the book here. 2003-02-06 Chris Toshok * gui/component/e-address-popup.c (email_table_save_card_cb): check the status, not the book, and unref the book here. (contact_editor_cb): same. (start_query): unref the book in the failure case. (add_card_idle_cb): addressbook_load_default_book returns void now. (edit_contact_info_cb): same. (e_address_popup_query): same. * gui/component/addressbook.c (control_activate_cb): track change to addressbook_load_uri return type. (set_prop): same. (addressbook_load_uri): return type is void now. (addressbook_load_default_book): same. * gui/component/addressbook.h: addressbook_load_uri/addressbook_load_default_book return void now. * conduit/address-conduit.c (start_addressbook_server): e_book_load_default_book returns void now. * backend/ebook/e-book-util.h: track changes to return types. * backend/ebook/e-book-util.c (e_book_load_address_book_by_uri): fallout from change to e_book_load_uri. return type for this function is void now too. (e_book_use_address_book_by_uri): same. (e_book_use_default_book): same. (e_book_load_default_book): same. (got_uri_book_cb): if unsuccessful and book is non-NULL, unref it here. (got_default_book_cb): same. * backend/ebook/e-book.c (e_book_load_uri): no longer return a gboolean. any error is communicated to the callback. * backend/ebook/e-book.h: e_book_load_uri no longer returns a gboolean (it's void.) * backend/ebook/evolution-ldif-importer.c (ebook_create): track change to the e_book_load_uri family of functions. * backend/ebook/test-client-list.c (ebook_create): same. * backend/ebook/test-client.c (ebook_create): same. * backend/ebook/load-pine-addressbook.c (ebook_create): same. * backend/ebook/evolution-vcard-importer.c (ebook_create): same. svn path=/trunk/; revision=19839 --- addressbook/gui/widgets/e-minicard-control.c | 10 ++++------ addressbook/gui/widgets/test-minicard-view.c | 5 +---- 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c index 36f40d86d5..7cbcfb028a 100644 --- a/addressbook/gui/widgets/e-minicard-control.c +++ b/addressbook/gui/widgets/e-minicard-control.c @@ -249,13 +249,14 @@ static void book_open_cb (EBook *book, EBookStatus status, gpointer closure) { GList *list = closure; - if (book) { + if (status == E_BOOK_STATUS_SUCCESS) { GList *p; for (p = list; p; p = p->next) { e_card_merging_book_add_card(book, p->data, NULL, NULL); } - g_object_unref (book); } + if (book) + g_object_unref (book); e_free_object_list (list); } @@ -273,10 +274,7 @@ save_in_addressbook(GtkWidget *button, gpointer data) for (p = list; p; p = p->next) g_object_ref (p->data); - if (!addressbook_load_default_book (book, book_open_cb, list)) { - g_object_unref (book); - book_open_cb (NULL, E_BOOK_STATUS_OTHER_ERROR, list); - } + addressbook_load_default_book (book, book_open_cb, list); } static void diff --git a/addressbook/gui/widgets/test-minicard-view.c b/addressbook/gui/widgets/test-minicard-view.c index 7abe611711..1a4ff8e07f 100644 --- a/addressbook/gui/widgets/test-minicard-view.c +++ b/addressbook/gui/widgets/test-minicard-view.c @@ -132,10 +132,7 @@ ebook_create (gpointer data) } - if (! e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL)) { - printf ("error calling load_uri!\n"); - } - + e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL); return FALSE; } -- cgit v1.2.3