aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend/ebook
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@helixcode.com>2000-04-26 20:50:17 +0800
committerChris Lahey <clahey@src.gnome.org>2000-04-26 20:50:17 +0800
commit128425f45d977b583a0340043a56c2b8dd08f925 (patch)
treed6e370950b2fdeac36a966bef92d3728685ada74 /addressbook/backend/ebook
parentc93a2e37f54523d409556426d4179761c8838b9f (diff)
downloadgsoc2013-evolution-128425f45d977b583a0340043a56c2b8dd08f925.tar
gsoc2013-evolution-128425f45d977b583a0340043a56c2b8dd08f925.tar.gz
gsoc2013-evolution-128425f45d977b583a0340043a56c2b8dd08f925.tar.bz2
gsoc2013-evolution-128425f45d977b583a0340043a56c2b8dd08f925.tar.lz
gsoc2013-evolution-128425f45d977b583a0340043a56c2b8dd08f925.tar.xz
gsoc2013-evolution-128425f45d977b583a0340043a56c2b8dd08f925.tar.zst
gsoc2013-evolution-128425f45d977b583a0340043a56c2b8dd08f925.zip
Prefixed the ADDR_ flags.
2000-04-26 Christopher James Lahey <clahey@helixcode.com> * backend/ebook/e-card-types.h, backend/ebook/e-card.c, gui/minicard/e-minicard.c: Prefixed the ADDR_ flags. * contact-editor/contact-editor.glade, contact-editor/e-contact-editor-strings.h: Edited the glade file. Removed all the fields that we don't use. * contact-editor/e-contact-editor.c, contact-editor/e-contact-editor.h: Made the phone fields work properly. The address and email fields are temporarily turned off until they can be made to work as the phone fields do. svn path=/trunk/; revision=2625
Diffstat (limited to 'addressbook/backend/ebook')
-rw-r--r--addressbook/backend/ebook/e-card-types.h12
-rw-r--r--addressbook/backend/ebook/e-card.c24
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++) {