aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend/ebook
diff options
context:
space:
mode:
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++) {
generated by cgit (git 2.34.1) at 2024-09-29 07:33:52 +0800
'commitgraph'>* ** Fix for bug #525234Ondrej Jirman2008-04-071-0/+6 * Remove redundant files meeting-page.[ch], cal-attachment.glade andHarish Krishnaswamy2006-06-011-2/+0 * **Fixes #321832 Pickup the right-icon for f/b. Define EVOLUTION_ICONSDIRVeerapuram Varadhan2006-03-061-0/+1 * Committing the calendar publishing patch.Chenthill Palanisamy2005-12-191-5/+2 * UI changes for the event editor.Chenthill Palanisamy2005-11-151-0/+2 * Memo Component - submitted by Nathan Owens <pianocomp81@yahoo.com>Harish Krishnaswamy2005-10-191-1/+6 * Added a structure. Removed cal-attachment* Removed the attachment barSrinivasa Ragavan2005-07-111-5/+0 * Prune unnecessary and nonexistent directories from the -I options. PruneTor Lillqvist2005-06-271-6/+0 * Retired GAL from Head. The relevant files have moved inside evolution.Kaushal Kumar2005-06-171-0/+1 * Added support for attachments support to calendar items.Harish Krishnaswamy2005-01-081-0/+7 * Commiting send optionsChenthill Palanisamy2005-01-061-0/+2 * Correct bad include.Hans Petter Jansson2004-12-231-13/+0 * add libeabutil, since we use e-destination.Not Zed2004-12-031-0/+3 * added EConfig subclass for calendars initialize plugin hooks on componentDavid Trowbridge2004-11-041-1/+0 * store all the custom alarms (alarm_custom_clicked_cb): emit changed signalJP Rosevear2004-06-251-3/+0 * removed alarm-page.*.Rodrigo Moya2004-06-231-3/+0 * HIGify and newer design; alarm page is gone, Cancel/OK buttons for theJP Rosevear2004-06-231-0/+6 * new dialog for allowing the user to select a source.Rodrigo Moya2004-03-171-0/+2 * Fix location of e-activity-handler.h #includeDan Winship2004-02-041-0/+1 * add e-pub-utils.[ch] for Free/Busy publishingGary Ekker2004-01-131-3/+5 * calendar_config -> calendar_setup. (edit_calendar_cb): Ditto.Hans Petter Jansson2004-01-101-6/+3 * Call calendar_config_new_calendar(). (rename_calendar_cb): Remove.Hans Petter Jansson2004-01-101-3/+3 * new files containing the implementation of the 'New Task List' dialog.Rodrigo Moya2003-11-241-0/+3 * fixed compilation errors.Rodrigo Moya2003-11-241-0/+1 * fixed copyright notices.Rodrigo Moya2003-11-241-0/+2 * remove includes for toplevel libical dirJP Rosevear2003-11-081-1/+0 * Various changes to merge in evolution-data-server reliance.JP Rosevear2003-11-071-2/+0 * Merge new-ui-branch to the trunk.Ettore Perazzoli2003-10-221-0/+3 * INCLUDE path fixes for changes made to libical build.Jeffrey Stedfast2003-10-101-2/+1 * new VOID:STRING,STRING,STRING build the new view/store/renderer/editableMike Kestner2003-10-011-4/+1 * Fixes #37552JP Rosevear2003-04-251-0/+2 * [ fixes #21499 ]Rodney Dawes2003-04-191-0/+1 * Oops. Add this back. Turns out it's still needed by other parts.Dan Winship2003-04-121-0/+14 * Remove the "Contacts" button and entry from here too. Supposed to haveDan Winship2003-04-111-14/+0 * If only the pipe wouldn't break.JP Rosevear2003-03-051-0/+2 * build libcal-dialogs as an uninstalled shared library ($(IDL_GENERATED_H),Dan Winship2003-03-011-9/+5 * revert previous changeDan Winship2003-02-201-2/+2 * Remove libversit. We haven't depended on that in forever.Dan Winship2003-02-201-2/+2 * Make the CORBA IDL compilation work with parallel makes. Likewise.Ettore Perazzoli2003-02-111-3/+6 * Remove cruft. Rename ICONSDIR to IMAGESDIR. (gladedir, etspecdir): RemoveDan Winship2003-02-061-5/+1 * Remove, this is now defined in configure.in.Ettore Perazzoli2003-01-251-2/+0 * Use EVOLUTION_GALVIEWSDIR.Ettore Perazzoli2003-01-231-3/+4 * Icons are now in $(datadir)/evolution/images instead ofEttore Perazzoli2003-01-091-1/+1 * use libxml2 headers.Rodrigo Moya2002-11-051-1/+1 * Add include lines to get ebook headers relative to <ebook/foo.h>, notPeter Williams2002-07-111-2/+2 * Clean up some of the Makefiles so we dont' link every library multipleEttore Perazzoli2002-01-251-4/+3 * <ettore> ok so <ettore> should I build this tarball again? ettore doesn'tDan Winship2001-11-061-0/+1 * Added rules to generate `Evolution-Addressbook-SelectNames.h'.Ettore Perazzoli2001-11-011-18/+32 * call the invite others dialog in the modelJP Rosevear2001-10-191-18/+0 * call set_icon_from_comp. (set_icon_from_comp): set the window icon fromLarry Ewing2001-10-141-0/+3 * A page that shows the meeting time selector and free/busy data forJP Rosevear2001-09-191-0/+3 * [Automake 1.5 fixes pointed out by Richard BoultonEttore Perazzoli2001-09-151-1/+1 * Startup assistant stuffIain Holmes2001-08-171-3/+0 * stip the delto and delfrom (popup_delegate_cb): show a delegate dialog andJP Rosevear2001-07-251-0/+5 * fix typo breaking compilationJP Rosevear2001-07-131-1/+23 * be careful about adding and stripping MAILTO:'s properlyJP Rosevear2001-07-121-1/+2 * [Fix bug #4388: ETableSpecification still in .c file]Jason Leach2001-07-111-0/+4 * New files with the alarm options dialog; this configures theFederico Mena Quintero2001-07-031-0/+3 * Converted to use BonoboXObject.Federico Mena Quintero2001-06-251-3/+0 * add include pathJP Rosevear2001-06-221-0/+2 * print menu command (print_preview_cmd): ditto for print previewJP Rosevear2001-06-211-0/+2 * itip/imip send dialogJP Rosevear2001-06-201-0/+7 * new dialog for setting the time zone.Damon Chaplin2001-06-141-0/+3 * renamed from editor-page for consistency, more complete implementationJP Rosevear2001-06-021-4/+13 * Finished porting from the old event-editor.c. Made it store a clone of theFederico Mena Quintero2001-05-241-0/+2 * Split the event and task editors into different objects for the separateFederico Mena Quintero2001-05-171-4/+15 * Merge build fix from the branch:Ettore Perazzoli2001-04-271-0/+1 * Hot builddir != srcdir loving action.Ettore Perazzoli2001-04-191-0/+2 * Getting almost full and proper use of xml-i18n-tools.Gediminas Paulauskas2001-02-111-7/+1 * compile new stuffJP Rosevear2001-01-231-0/+2 * Fixes bug #920.Federico Mena Quintero2000-12-071-0/+2 * AM_GNOME_GETTEXT doesn't use $(datadir)/locale as the locale dir. (ItDan Winship2000-10-241-1/+1