Use e_card_get_vcard_assume_utf8 instead of e_card_get_vcard here since

2001-09-02  Christopher James Lahey  <clahey@ximian.com>

	* backend/ebook/e-book.c (e_book_add_card, e_book_commit_card),
	backend/pas/pas-backend-file.c (do_create),
	backend/pas/pas-backend-ldap.c
	(create_card_handler, remove_card_handler, modify_card_handler,
	pas_backend_ldap_process_get_vcard, poll_ldap): Use
	e_card_get_vcard_assume_utf8 instead of e_card_get_vcard here
	since all internal communications and database storage are assumed
	to be utf8.

	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h
	(e_card_simple_duplicate): Simplified this function considerably.
	(e_card_simple_get_vcard_assume_utf8): Added this function.

	* backend/ebook/e-card.c, backend/ebook/e-card.h (e_card_new,
	e_card_load_cards_from_file, e_card_load_cards_from_string): Made
	these functions pay attention to charset attributes.
	(e_card_new_with_default_charset,
	e_card_load_cards_from_file_with_default_charset,
	e_card_load_cards_from_string_with_default_charset): New functions
	that let you change the default charset from UTF-8.
	(e_card_get_vcard): Made this write out charset attributes when
	necessary.
	(e_card_get_vcard_assume_utf8): New function that writes out a
	card without writing out charset attributes.

	* backend/ebook/evolution-vcard-importer.c (book_open_cb),
	backend/ebook/load-gnomecard-addressbook.c (book_open_cb),
	backend/ebook/test-card.c (main),
	gui/component/addressbook-component.c
	(destination_folder_handle_drop), gui/contact-editor/test-editor.c
	(main), gui/contact-list-editor/e-contact-list-editor.c
	(table_drag_data_received_cb), gui/widgets/e-addressbook-view.c
	(selection_received), gui/widgets/e-minicard-control.c
	(pstream_load): Changed the default charset to be used here to
	ISO-8859-1.

	* backend/ebook/load-gnomecard-addressbook.c (add_card_cb),
	backend/ebook/load-pine-addressbook.c (add_card_cb),
	backend/ebook/test-client-list.c (get_cursor_cb),
	backend/ebook/test-client.c (get_cursor_cb, get_card_cb): Use
	e_card_get_vcard_assume_utf8 to print out testing strings.

	* gui/component/select-names/e-select-names-model.c,
	gui/component/select-names/e-select-names-model.h
	(e_select_names_model_contains): Changed this to be const
	EDestination *dest to fix a warning.

	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
	Translate window title here.

svn path=/trunk/; revision=12558

2 files changed, 7 insertions, 7 deletions

diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index 77455f59fc..c8d63104d4 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -472,7 +472,7 @@ do_create(PASBackend *backend,
 	
 	card = e_card_new(vcard_req);
 	e_card_set_id(card, id);
-	vcard = e_card_get_vcard(card);
+	vcard = e_card_get_vcard_assume_utf8(card);
 
 	string_to_dbt (vcard, &vcard_dbt);
 
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
index 54a7095d46..da49f8ea9a 100644
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ b/addressbook/backend/pas/pas-backend-ldap.c
@@ -878,9 +878,9 @@ create_card_handler (PASBackend *backend, LDAPOp *op)
 			bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
 
 			match = pas_backend_card_sexp_match_vcard (view->card_sexp,
-								   e_card_simple_get_vcard (new_card));
+								   e_card_simple_get_vcard_assume_utf8 (new_card));
 			if (match)
-				pas_book_view_notify_add_1 (view->book_view, e_card_simple_get_vcard (new_card));
+				pas_book_view_notify_add_1 (view->book_view, e_card_simple_get_vcard_assume_utf8 (new_card));
 			pas_book_view_notify_complete (view->book_view);
 
 			bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
@@ -971,7 +971,7 @@ remove_card_handler (PASBackend *backend, LDAPOp *op)
 				bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
 
 				match = pas_backend_card_sexp_match_vcard (view->card_sexp,
-									   e_card_simple_get_vcard (simple));
+									   e_card_simple_get_vcard_assume_utf8 (simple));
 				if (match)
 					pas_book_view_notify_remove (view->book_view, remove_op->id);
 				pas_book_view_notify_complete (view->book_view);
@@ -1079,7 +1079,7 @@ modify_card_handler (PASBackend *backend, LDAPOp *op)
 					bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
 
 					old_match = pas_backend_card_sexp_match_vcard (view->card_sexp,
-										       e_card_simple_get_vcard (current_card));
+										       e_card_simple_get_vcard_assume_utf8 (current_card));
 					new_match = pas_backend_card_sexp_match_vcard (view->card_sexp,
 										       modify_op->vcard);
 					if (old_match && new_match)
@@ -1166,7 +1166,7 @@ pas_backend_ldap_process_get_vcard (PASBackend *backend,
 	if (simple) {
 		pas_book_respond_get_vcard (book,
 					    GNOME_Evolution_Addressbook_BookListener_Success,
-					    e_card_simple_get_vcard (simple));
+					    e_card_simple_get_vcard_assume_utf8 (simple));
 		gtk_object_unref (GTK_OBJECT (simple));
 	}
 	else {
@@ -2005,7 +2005,7 @@ poll_ldap (LDAPSearchOp *op)
 	while (NULL != e) {
 		ECardSimple *card = build_card_from_entry (ldap, e);
 
-		cards = g_list_append (cards, e_card_simple_get_vcard (card));
+		cards = g_list_append (cards, e_card_simple_get_vcard_assume_utf8 (card));
 
 		gtk_object_unref (GTK_OBJECT(card));