From 0fbeb97f39c4c27665b53ae45707ba065d71ebb2 Mon Sep 17 00:00:00 2001
From: Christopher James Lahey <clahey@ximian.com>
Date: Sun, 2 Sep 2001 06:27:53 +0000
Subject: 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
---
 addressbook/backend/ebook/e-card-simple.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'addressbook/backend/ebook/e-card-simple.c')

diff --git a/addressbook/backend/ebook/e-card-simple.c b/addressbook/backend/ebook/e-card-simple.c
index 713b587cb2..f41c4f0cb5 100644
--- a/addressbook/backend/ebook/e-card-simple.c
+++ b/addressbook/backend/ebook/e-card-simple.c
@@ -240,10 +240,8 @@ e_card_simple_new (ECard *card)
 ECardSimple *
 e_card_simple_duplicate(ECardSimple *simple)
 {
-	char *vcard = e_card_simple_get_vcard(simple);
-	ECard *card = e_card_new(vcard);
+	ECard *card = simple->card ? e_card_duplicate (simple->card) : e_card_new ("");
 	ECardSimple *new_simple = e_card_simple_new(card);
-	g_free (vcard);
 	return new_simple;
 }
 
@@ -293,6 +291,21 @@ e_card_simple_get_vcard (ECardSimple *simple)
 		return g_strdup("");
 }
 
+/**
+ * e_card_simple_get_vcard_assume_utf8:
+ * @simple: an #ECardSimple
+ *
+ * Returns: a string in vcard format, which is wrapped by the @simple.
+ */
+char *
+e_card_simple_get_vcard_assume_utf8 (ECardSimple *simple)
+{
+	if (simple->card)
+		return e_card_get_vcard_assume_utf8(simple->card);
+	else
+		return g_strdup("");
+}
+
 static void
 e_card_simple_class_init (ECardSimpleClass *klass)
 {
-- 
cgit