check the status, not the book, and unref the book here.

2003-02-06  Chris Toshok  <toshok@ximian.com>

	* 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

1 files changed, 6 insertions, 20 deletions

diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 9ab5d87320..5baaa05733 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -413,8 +413,7 @@ control_activate_cb (BonoboControl *control,
 			book = e_book_new ();
 			uri_data = e_book_expand_uri (view->uri);
 
-			if (! addressbook_load_uri (book, uri_data, book_open_cb, view))
-				printf ("error calling load_uri!\n");
+			addressbook_load_uri (book, uri_data, book_open_cb, view);
 
 			g_free(uri_data);
 		}
@@ -729,39 +728,27 @@ load_uri_cb (EBook *book, EBookStatus status, gpointer closure)
 	g_free (load_uri_data);
 }
 
-gboolean
+void
 addressbook_load_uri (EBook *book, const char *uri,
 		      EBookCallback cb, gpointer closure)
 {
 	LoadUriData *load_uri_data = g_new0 (LoadUriData, 1);
-	gboolean rv;
 
 	load_uri_data->cb = cb;
 	load_uri_data->closure = closure;
 
-	rv = e_book_load_uri (book, uri, load_uri_cb, load_uri_data);
-
-	if (!rv)
-		g_free (load_uri_data);
-
-	return rv;
+	e_book_load_uri (book, uri, load_uri_cb, load_uri_data);
 }
 
-gboolean
+void
 addressbook_load_default_book (EBook *book, EBookCallback cb, gpointer closure)
 {
 	LoadUriData *load_uri_data = g_new (LoadUriData, 1);
-	gboolean rv;
 
 	load_uri_data->cb = cb;
 	load_uri_data->closure = closure;
 
-	rv = e_book_load_default_book (book, load_uri_cb, load_uri_data);
-
-	if (!rv)
-		g_free (load_uri_data);
-
-	return rv;
+	e_book_load_default_book (book, load_uri_cb, load_uri_data);
 }
 
 static void
@@ -796,8 +783,7 @@ set_prop (BonoboPropertyBag *bag,
 		
 		uri_data = e_book_expand_uri (view->uri);
 
-		if (! addressbook_load_uri (book, uri_data, book_open_cb, view))
-			printf ("error calling load_uri!\n");
+		addressbook_load_uri (book, uri_data, book_open_cb, view);
 
 		g_free(uri_data);