From 4d2170603714dc34ea1c051b23340e81fd911159 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Fri, 3 Aug 2001 14:38:20 +0000 Subject: Made the list of E_CARD_PHONE types in phone_correspondences more complete 2001-08-03 Christopher James Lahey * backend/ebook/e-card-simple.c (e_card_simple_sync_card, fill_in_info): Made the list of E_CARD_PHONE types in phone_correspondences more complete by adding the new 5 E_CARD_PHONE types. Also, made it a bit less restrictive for some types (E_CARD_PHONE_HOME will actually match E_CARD_SIMPLE_PHONE_ID_HOME now.) Made e_card_simple_sync_card and fill_in_info search for an exact match in the list of phone_correspondences and then look for a partial match. Got rid of not going forward when doing a remove from an EList since EList handles this case automatically. * backend/ebook/e-card-types.h: Added E_CARD_PHONE types for assistant, callback, radio, telex, and ttytdd. * backend/ebook/e-card.c (get_phone_flags, set_phone_flags): Handle the new E_CARD_PHONE types. svn path=/trunk/; revision=11612 --- addressbook/ChangeLog | 19 +++++++++ addressbook/backend/ebook/e-card-simple.c | 70 ++++++++++++++++++++----------- addressbook/backend/ebook/e-card-types.h | 31 ++++++++------ addressbook/backend/ebook/e-card.c | 36 ++++++++++------ 4 files changed, 105 insertions(+), 51 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 0f5e7fe4c6..9ff5690c2a 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,22 @@ +2001-08-03 Christopher James Lahey + + * backend/ebook/e-card-simple.c (e_card_simple_sync_card, + fill_in_info): Made the list of E_CARD_PHONE types in + phone_correspondences more complete by adding the new 5 + E_CARD_PHONE types. Also, made it a bit less restrictive for some + types (E_CARD_PHONE_HOME will actually match + E_CARD_SIMPLE_PHONE_ID_HOME now.) Made e_card_simple_sync_card + and fill_in_info search for an exact match in the list of + phone_correspondences and then look for a partial match. Got rid + of not going forward when doing a remove from an EList since EList + handles this case automatically. + + * backend/ebook/e-card-types.h: Added E_CARD_PHONE types for + assistant, callback, radio, telex, and ttytdd. + + * backend/ebook/e-card.c (get_phone_flags, set_phone_flags): + Handle the new E_CARD_PHONE types. + 2001-08-02 Jon Trowbridge * printing/Makefile.am (ecpsdir): Add camel dependency. diff --git a/addressbook/backend/ebook/e-card-simple.c b/addressbook/backend/ebook/e-card-simple.c index a9f33350d5..5bd8bb57e5 100644 --- a/addressbook/backend/ebook/e-card-simple.c +++ b/addressbook/backend/ebook/e-card-simple.c @@ -112,25 +112,25 @@ static void e_card_simple_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) static void fill_in_info(ECardSimple *simple); ECardPhoneFlags phone_correspondences[] = { - 0xFF, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT, */ + E_CARD_PHONE_ASSISTANT, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT, */ E_CARD_PHONE_WORK | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS, */ E_CARD_PHONE_WORK | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS_2, */ E_CARD_PHONE_WORK | E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX, */ - 0xFF, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK, */ - E_CARD_PHONE_CAR | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_CAR, */ - 0xFF, /* E_CARD_SIMPLE_PHONE_ID_COMPANY, */ - E_CARD_PHONE_HOME | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_HOME, */ - E_CARD_PHONE_HOME | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_HOME_2, */ + E_CARD_PHONE_CALLBACK, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK, */ + E_CARD_PHONE_CAR, /* E_CARD_SIMPLE_PHONE_ID_CAR, */ + E_CARD_PHONE_WORK, /* E_CARD_SIMPLE_PHONE_ID_COMPANY, */ + E_CARD_PHONE_HOME, /* E_CARD_SIMPLE_PHONE_ID_HOME, */ + E_CARD_PHONE_HOME, /* E_CARD_SIMPLE_PHONE_ID_HOME_2, */ E_CARD_PHONE_HOME | E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_HOME_FAX, */ E_CARD_PHONE_ISDN, /* E_CARD_SIMPLE_PHONE_ID_ISDN, */ - E_CARD_PHONE_CELL | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_MOBILE, */ + E_CARD_PHONE_CELL, /* E_CARD_SIMPLE_PHONE_ID_MOBILE, */ E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_OTHER, */ - 0xFF, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX, */ - E_CARD_PHONE_PAGER | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_PAGER, */ + E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX, */ + E_CARD_PHONE_PAGER, /* E_CARD_SIMPLE_PHONE_ID_PAGER, */ E_CARD_PHONE_PREF, /* E_CARD_SIMPLE_PHONE_ID_PRIMARY, */ - 0xFF, /* E_CARD_SIMPLE_PHONE_ID_RADIO, */ - 0xFF, /* E_CARD_SIMPLE_PHONE_ID_TELEX, */ - 0xFF, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD, */ + E_CARD_PHONE_RADIO, /* E_CARD_SIMPLE_PHONE_ID_RADIO, */ + E_CARD_PHONE_TELEX, /* E_CARD_SIMPLE_PHONE_ID_TELEX, */ + E_CARD_PHONE_TTYTDD, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD, */ }; char *phone_names[] = { @@ -432,7 +432,17 @@ fill_in_info(ECardSimple *simple) simple->phone[i] = NULL; } for (iterator = e_list_get_iterator(phone_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) { + gboolean found = FALSE; phone = e_iterator_get(iterator); + for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) { + if ((phone->flags == phone_correspondences[i]) && (simple->phone[i] == NULL)) { + simple->phone[i] = e_card_phone_copy(phone); + found = TRUE; + break; + } + } + if (found) + continue; for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) { if (((phone->flags & phone_correspondences[i]) == phone_correspondences[i]) && (simple->phone[i] == NULL)) { simple->phone[i] = e_card_phone_copy(phone); @@ -504,7 +514,6 @@ e_card_simple_sync_card(ECardSimple *simple) const ECardDeliveryAddress *delivery; const char *email; int i; - int iterator_next = 1; EIterator *iterator; @@ -515,10 +524,28 @@ e_card_simple_sync_card(ECardSimple *simple) "email", &email_list, NULL); - for (iterator = e_list_get_iterator(phone_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) { + for (iterator = e_list_get_iterator(phone_list); e_iterator_is_valid(iterator); e_iterator_next(iterator) ) { int i; + gboolean found = FALSE; phone = e_iterator_get(iterator); - iterator_next = 1; + for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) { + if (phone->flags == phone_correspondences[i]) { + if (simple->phone[i]) { + simple->phone[i]->flags = phone_correspondences[i]; + if (simple->phone[i]->number && *simple->phone[i]->number) { + e_iterator_set(iterator, simple->phone[i]); + } else { + e_iterator_delete(iterator); + } + e_card_phone_free(simple->phone[i]); + simple->phone[i] = NULL; + found = TRUE; + break; + } + } + } + if (found) + continue; for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) { if ((phone->flags & phone_correspondences[i]) == phone_correspondences[i]) { if (simple->phone[i]) { @@ -527,7 +554,6 @@ e_card_simple_sync_card(ECardSimple *simple) e_iterator_set(iterator, simple->phone[i]); } else { e_iterator_delete(iterator); - iterator_next = 0; } e_card_phone_free(simple->phone[i]); simple->phone[i] = NULL; @@ -546,17 +572,15 @@ e_card_simple_sync_card(ECardSimple *simple) } } - for (iterator = e_list_get_iterator(email_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) { + for (iterator = e_list_get_iterator(email_list); e_iterator_is_valid(iterator); e_iterator_next(iterator) ) { int i; email = e_iterator_get(iterator); - iterator_next = 1; for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) { if (simple->email[i]) { if (*simple->email[i]) { e_iterator_set(iterator, simple->email[i]); } else { e_iterator_delete(iterator); - iterator_next = 0; } g_free(simple->email[i]); simple->email[i] = NULL; @@ -573,10 +597,9 @@ e_card_simple_sync_card(ECardSimple *simple) } } - for (iterator = e_list_get_iterator(address_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) { + for (iterator = e_list_get_iterator(address_list); e_iterator_is_valid(iterator); e_iterator_next(iterator) ) { int i; address = e_iterator_get(iterator); - iterator_next = 1; for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) { if ((address->flags & addr_correspondences[i]) == addr_correspondences[i]) { if (simple->address[i]) { @@ -585,7 +608,6 @@ e_card_simple_sync_card(ECardSimple *simple) e_iterator_set(iterator, simple->address[i]); } else { e_iterator_delete(iterator); - iterator_next = 0; } e_card_address_label_free(simple->address[i]); simple->address[i] = NULL; @@ -604,10 +626,9 @@ e_card_simple_sync_card(ECardSimple *simple) } } - for (iterator = e_list_get_iterator(delivery_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) { + for (iterator = e_list_get_iterator(delivery_list); e_iterator_is_valid(iterator); e_iterator_next(iterator) ) { int i; delivery = e_iterator_get(iterator); - iterator_next = 1; for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) { if ((delivery->flags & addr_correspondences[i]) == addr_correspondences[i]) { if (simple->delivery[i]) { @@ -616,7 +637,6 @@ e_card_simple_sync_card(ECardSimple *simple) e_iterator_set(iterator, simple->delivery[i]); } else { e_iterator_delete(iterator); - iterator_next = 0; } e_card_delivery_address_free(simple->delivery[i]); simple->delivery[i] = NULL; diff --git a/addressbook/backend/ebook/e-card-types.h b/addressbook/backend/ebook/e-card-types.h index 542ca13517..13854c30e7 100644 --- a/addressbook/backend/ebook/e-card-types.h +++ b/addressbook/backend/ebook/e-card-types.h @@ -30,19 +30,24 @@ typedef struct { /* TELECOMMUNICATIONS ADDRESSING PROPERTIES */ typedef enum { - E_CARD_PHONE_PREF = 1 << 0, - E_CARD_PHONE_WORK = 1 << 1, - E_CARD_PHONE_HOME = 1 << 2, - E_CARD_PHONE_VOICE = 1 << 3, - E_CARD_PHONE_FAX = 1 << 4, - E_CARD_PHONE_MSG = 1 << 5, - E_CARD_PHONE_CELL = 1 << 6, - E_CARD_PHONE_PAGER = 1 << 7, - E_CARD_PHONE_BBS = 1 << 8, - E_CARD_PHONE_MODEM = 1 << 9, - E_CARD_PHONE_CAR = 1 << 10, - E_CARD_PHONE_ISDN = 1 << 11, - E_CARD_PHONE_VIDEO = 1 << 12 + E_CARD_PHONE_PREF = 1 << 0, + E_CARD_PHONE_WORK = 1 << 1, + E_CARD_PHONE_HOME = 1 << 2, + E_CARD_PHONE_VOICE = 1 << 3, + E_CARD_PHONE_FAX = 1 << 4, + E_CARD_PHONE_MSG = 1 << 5, + E_CARD_PHONE_CELL = 1 << 6, + E_CARD_PHONE_PAGER = 1 << 7, + E_CARD_PHONE_BBS = 1 << 8, + E_CARD_PHONE_MODEM = 1 << 9, + E_CARD_PHONE_CAR = 1 << 10, + E_CARD_PHONE_ISDN = 1 << 11, + E_CARD_PHONE_VIDEO = 1 << 12, + E_CARD_PHONE_ASSISTANT = 1 << 13, + E_CARD_PHONE_CALLBACK = 1 << 14, + E_CARD_PHONE_RADIO = 1 << 15, + E_CARD_PHONE_TELEX = 1 << 16, + E_CARD_PHONE_TTYTDD = 1 << 17, } ECardPhoneFlags; typedef struct { diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c index 9700f60ce7..b9d930cdb4 100644 --- a/addressbook/backend/ebook/e-card.c +++ b/addressbook/backend/ebook/e-card.c @@ -3848,6 +3848,11 @@ get_phone_flags (VObject *vobj) { VCCarProp, E_CARD_PHONE_CAR }, { VCISDNProp, E_CARD_PHONE_ISDN }, { VCVideoProp, E_CARD_PHONE_VIDEO }, + { "X-EVOLUTION-ASSISTANT", E_CARD_PHONE_ASSISTANT }, + { "X-EVOLUTION-CALLBACK", E_CARD_PHONE_CALLBACK }, + { "X-EVOLUTION-RADIO", E_CARD_PHONE_RADIO }, + { "X-EVOLUTION-TELEX", E_CARD_PHONE_TELEX }, + { "X-EVOLUTION-TTYTDD", E_CARD_PHONE_TTYTDD }, }; for (i = 0; i < sizeof(phone_pairs) / sizeof(phone_pairs[0]); i++) { @@ -3868,19 +3873,24 @@ set_phone_flags (VObject *vobj, ECardPhoneFlags flags) char *id; ECardPhoneFlags flag; } phone_pairs[] = { - { VCPreferredProp, E_CARD_PHONE_PREF }, - { VCWorkProp, E_CARD_PHONE_WORK }, - { VCHomeProp, E_CARD_PHONE_HOME }, - { VCVoiceProp, E_CARD_PHONE_VOICE }, - { VCFaxProp, E_CARD_PHONE_FAX }, - { VCMessageProp, E_CARD_PHONE_MSG }, - { VCCellularProp, E_CARD_PHONE_CELL }, - { VCPagerProp, E_CARD_PHONE_PAGER }, - { VCBBSProp, E_CARD_PHONE_BBS }, - { VCModemProp, E_CARD_PHONE_MODEM }, - { VCCarProp, E_CARD_PHONE_CAR }, - { VCISDNProp, E_CARD_PHONE_ISDN }, - { VCVideoProp, E_CARD_PHONE_VIDEO }, + { VCPreferredProp, E_CARD_PHONE_PREF }, + { VCWorkProp, E_CARD_PHONE_WORK }, + { VCHomeProp, E_CARD_PHONE_HOME }, + { VCVoiceProp, E_CARD_PHONE_VOICE }, + { VCFaxProp, E_CARD_PHONE_FAX }, + { VCMessageProp, E_CARD_PHONE_MSG }, + { VCCellularProp, E_CARD_PHONE_CELL }, + { VCPagerProp, E_CARD_PHONE_PAGER }, + { VCBBSProp, E_CARD_PHONE_BBS }, + { VCModemProp, E_CARD_PHONE_MODEM }, + { VCCarProp, E_CARD_PHONE_CAR }, + { VCISDNProp, E_CARD_PHONE_ISDN }, + { VCVideoProp, E_CARD_PHONE_VIDEO }, + { "X-EVOLUTION-ASSISTANT", E_CARD_PHONE_ASSISTANT }, + { "X-EVOLUTION-CALLBACK", E_CARD_PHONE_CALLBACK }, + { "X-EVOLUTION-RADIO", E_CARD_PHONE_RADIO }, + { "X-EVOLUTION-TELEX", E_CARD_PHONE_TELEX }, + { "X-EVOLUTION-TTYTDD", E_CARD_PHONE_TTYTDD }, }; for (i = 0; i < sizeof(phone_pairs) / sizeof(phone_pairs[0]); i++) { -- cgit