diff options
Diffstat (limited to 'addressbook/backend/ebook')
| -rw-r--r-- | addressbook/backend/ebook/e-card-types.h | 12 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-card.c | 24 |
2 files changed, 18 insertions, 18 deletions
diff --git a/addressbook/backend/ebook/e-card-types.h b/addressbook/backend/ebook/e-card-types.h index 1fce805e91..d530f69f8b 100644 --- a/addressbook/backend/ebook/e-card-types.h +++ b/addressbook/backend/ebook/e-card-types.h @@ -180,12 +180,12 @@ typedef struct { /* DELIVERY ADDRESSING PROPERTIES */ typedef enum { - ADDR_HOME = 1 << 0, - ADDR_WORK = 1 << 1, - ADDR_POSTAL = 1 << 2, - ADDR_PARCEL = 1 << 3, - ADDR_DOM = 1 << 4, - ADDR_INTL = 1 << 5 + E_CARD_ADDR_HOME = 1 << 0, + E_CARD_ADDR_WORK = 1 << 1, + E_CARD_ADDR_POSTAL = 1 << 2, + E_CARD_ADDR_PARCEL = 1 << 3, + E_CARD_ADDR_DOM = 1 << 4, + E_CARD_ADDR_INTL = 1 << 5 } ECardAddressFlags; typedef struct { diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c index 683c4add13..23c9df5d36 100644 --- a/addressbook/backend/ebook/e-card.c +++ b/addressbook/backend/ebook/e-card.c @@ -2580,12 +2580,12 @@ get_address_flags (VObject *vobj) char *id; ECardAddressFlags flag; } addr_pairs[] = { - { VCDomesticProp, ADDR_DOM }, - { VCInternationalProp, ADDR_INTL }, - { VCPostalProp, ADDR_POSTAL }, - { VCParcelProp, ADDR_PARCEL }, - { VCHomeProp, ADDR_HOME }, - { VCWorkProp, ADDR_WORK }, + { VCDomesticProp, E_CARD_ADDR_DOM }, + { VCInternationalProp, E_CARD_ADDR_INTL }, + { VCPostalProp, E_CARD_ADDR_POSTAL }, + { VCParcelProp, E_CARD_ADDR_PARCEL }, + { VCHomeProp, E_CARD_ADDR_HOME }, + { VCWorkProp, E_CARD_ADDR_WORK }, }; for (i = 0; i < sizeof(addr_pairs) / sizeof(addr_pairs[0]); i++) { @@ -2606,12 +2606,12 @@ set_address_flags (VObject *vobj, ECardAddressFlags flags) char *id; ECardAddressFlags flag; } addr_pairs[] = { - { VCDomesticProp, ADDR_DOM }, - { VCInternationalProp, ADDR_INTL }, - { VCPostalProp, ADDR_POSTAL }, - { VCParcelProp, ADDR_PARCEL }, - { VCHomeProp, ADDR_HOME }, - { VCWorkProp, ADDR_WORK }, + { VCDomesticProp, E_CARD_ADDR_DOM }, + { VCInternationalProp, E_CARD_ADDR_INTL }, + { VCPostalProp, E_CARD_ADDR_POSTAL }, + { VCParcelProp, E_CARD_ADDR_PARCEL }, + { VCHomeProp, E_CARD_ADDR_HOME }, + { VCWorkProp, E_CARD_ADDR_WORK }, }; for (i = 0; i < sizeof(addr_pairs) / sizeof(addr_pairs[0]); i++) { |