If invoked from a non-contact folder, add the contact to the default

	* gui/component/addressbook-component.c (user_create_new_item_cb):
	If invoked from a non-contact folder, add the contact to the
	default contact folder, not the local one. If invoked from a
	contact folder, don't append "addressbook.db" to the URI, let
	ebook do the right thing. Fixes #28327 and #28325.

	* backend/idl/addressbook.idl (CallStatus): Add NoSuchBook.
	(Initially intended as part of a fix for #28327, but the other
	changes make it so the error code never ends up getting used any
	more, but it's still good to have.)

	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
	Handle NO_SUCH_BOOK.

	* backend/ebook/e-book-types.h (EBookStatus): Add
	E_BOOK_STATUS_NO_SUCH_BOOK.

	* backend/ebook/e-book-listener.c
	(e_book_listener_convert_status): add case for NoSuchBook.

	* backend/ebook/e-book-util.c (e_book_load_local_address_book):
	Kill this. Nothing should ever explicitly load the local
	addressbook.
	(e_book_use_default_book): Replaces e_book_use_local_address_book,
	using the default book instead.
	(e_book_default_book_open): Fall back to local contact folder on
	E_BOOK_STATUS_NO_SUCH_BOOK too.
	(e_book_query_address_default): Use default book, not local.

	* gui/component/e-address-widget.c (query_idle_fn): Use the
	default book, not the local book.

	* gui/component/select-names/e-select-names-popup.c
	(edit_contact_info_cb): Use the default book, not the local book.

	* backend/ebook/e-destination.c (e_destination_cardify): Use the
	default book, not the local book.
	(e_destination_touch): Query the default book, not the local book.

	* backend/ebook/e-card-compare.c (e_card_locate_match,
	e_card_locate_match_full): Use the default book, not the local
	book.

svn path=/trunk/; revision=17764

1 files changed, 3 insertions, 6 deletions

diff --git a/addressbook/backend/ebook/e-book-util.h b/addressbook/backend/ebook/e-book-util.h
index fe80b7e02c..c1c07564cd 100644
--- a/addressbook/backend/ebook/e-book-util.h
+++ b/addressbook/backend/ebook/e-book-util.h
@@ -51,10 +51,7 @@ void                   e_book_use_address_book_by_uri   (const char
 							 EBookCommonCallback       cb,
 							 gpointer                  closure);
 
-gboolean               e_book_load_local_address_book   (EBook                    *book,
-							 EBookCallback             open_response,
-							 gpointer                  closure);
-void                   e_book_use_local_address_book    (EBookCommonCallback       cb,
+void                   e_book_use_default_book          (EBookCommonCallback       cb,
 							 gpointer                  closure);
 gboolean               e_book_load_default_book         (EBook                    *book,
 							 EBookCallback             open_response,
@@ -84,8 +81,8 @@ guint                  e_book_nickname_query            (EBook
 							 gpointer                  closure);
 
 /* Returns the ECard associated to email in the callback,
-   or NULL if no match is found in the local address book. */
-void                   e_book_query_address_locally     (const gchar              *email,
+   or NULL if no match is found in the default address book. */
+void                   e_book_query_address_default     (const gchar              *email,
 							 EBookHaveAddressCallback  cb,
 							 gpointer                  closure);