aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend/ebook/evolution-vcard-importer.c
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@ximian.com>2001-09-02 14:27:53 +0800
committerChris Lahey <clahey@src.gnome.org>2001-09-02 14:27:53 +0800
commit0fbeb97f39c4c27665b53ae45707ba065d71ebb2 (patch)
treecfbaaca6c2389b42737c09e6d779f42ef890b111 /addressbook/backend/ebook/evolution-vcard-importer.c
parent03a5d4a3d316d8ec923d7bde331b1e96d08c6720 (diff)
downloadgsoc2013-evolution-0fbeb97f39c4c27665b53ae45707ba065d71ebb2.tar
gsoc2013-evolution-0fbeb97f39c4c27665b53ae45707ba065d71ebb2.tar.gz
gsoc2013-evolution-0fbeb97f39c4c27665b53ae45707ba065d71ebb2.tar.bz2
gsoc2013-evolution-0fbeb97f39c4c27665b53ae45707ba065d71ebb2.tar.lz
gsoc2013-evolution-0fbeb97f39c4c27665b53ae45707ba065d71ebb2.tar.xz
gsoc2013-evolution-0fbeb97f39c4c27665b53ae45707ba065d71ebb2.tar.zst
gsoc2013-evolution-0fbeb97f39c4c27665b53ae45707ba065d71ebb2.zip
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
Diffstat (limited to 'addressbook/backend/ebook/evolution-vcard-importer.c')
-rw-r--r--addressbook/backend/ebook/evolution-vcard-importer.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/addressbook/backend/ebook/evolution-vcard-importer.c b/addressbook/backend/ebook/evolution-vcard-importer.c
index c838fbc1d7..ea474f780b 100644
--- a/addressbook/backend/ebook/evolution-vcard-importer.c
+++ b/addressbook/backend/ebook/evolution-vcard-importer.c
@@ -31,9 +31,6 @@ static void
add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
{
ECard *card = E_CARD(closure);
- char *vcard = e_card_get_vcard(card);
-
- g_free(vcard);
gtk_object_unref(GTK_OBJECT(card));
}
@@ -42,7 +39,7 @@ book_open_cb (EBook *book, EBookStatus status, gpointer closure)
{
VCardImporter *gci = (VCardImporter *) closure;
- gci->cardlist = e_card_load_cards_from_file(gci->filename);
+ gci->cardlist = e_card_load_cards_from_file_with_default_charset(gci->filename, "ISO-8859-1");
gci->ready = TRUE;
}