From d10adfea7a903356ccf15161955325a83ebd9863 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Mon, 2 Jul 2001 05:24:44 +0000 Subject: use ECARD_UID_LINK_PREFIX. 2001-07-01 Chris Toshok * gui/contact-list-editor/e-contact-list-editor.c (fill_in_info): use ECARD_UID_LINK_PREFIX. * gui/contact-list-editor/e-contact-list-model.c (e_contact_list_model_get_email): use ECARD_UID_LINK_PREFIX. * backend/ebook/e-destination.h: add prototype for e_destination_importv_list. * backend/ebook/e-destination.c (e_destination_importv_list): new function, take an ECard corresponding to an address list and resolve any linked cards, returning an EDestination vector. * backend/ebook/e-card.h (ECARD_UID_LINK_PREFIX): #define this here, since we need to use it in a few places. svn path=/trunk/; revision=10667 --- addressbook/gui/contact-list-editor/e-contact-list-editor.c | 4 ++-- addressbook/gui/contact-list-editor/e-contact-list-model.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'addressbook/gui/contact-list-editor') diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index bff82c2f2b..86e283f0f6 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -804,11 +804,11 @@ fill_in_info(EContactListEditor *editor) while (e_iterator_is_valid (email_iter)) { const char *email = e_iterator_get (email_iter); - if (!strncmp (email, "X-EVOLUTION-UID=", strlen ("X-EVOLUTION-UID"))) { + if (!strncmp (email, ECARD_UID_LINK_PREFIX, strlen (ECARD_UID_LINK_PREFIX))) { ECard *card; const char *uid; /* it's a serialized uid */ - uid = email + strlen ("X-EVOLUTION-UID="); + uid = email + strlen (ECARD_UID_LINK_PREFIX); card = e_book_get_card (editor->book, uid); if (card) { ECardSimple *simple = e_card_simple_new (card); diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c index 4e5a336e07..5a966c67d1 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-model.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c @@ -267,5 +267,5 @@ e_contact_list_model_get_email (EContactListModel *model, int row) if (data->type == E_CONTACT_LIST_MODEL_ROW_EMAIL) return g_strdup (data->string); else - return g_strconcat ("|X-EVOLUTION-UID=", e_card_simple_get_id (data->simple), NULL); + return g_strconcat (ECARD_UID_LINK_PREFIX, e_card_simple_get_id (data->simple), NULL); } -- cgit