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

1 files changed, 52 insertions, 1 deletions

diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h
index 82f4a22623..fd80dc4c00 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ b/addressbook/gui/contact-editor/e-contact-editor.h
@@ -36,9 +36,52 @@ extern "C" {
  *
  * name		type		read/write	description
  * --------------------------------------------------------------------------------
- * card         ECard *         R               The card currently being edited
+ * card         ECard *         RW              The card currently being edited
  */
 
+typedef enum _EContactEditorPhoneId EContactEditorPhoneId;
+typedef enum _EContactEditorEmailId EContactEditorEmailId;
+typedef enum _EContactEditorAddressId EContactEditorAddressId;
+
+enum _EContactEditorPhoneId {
+	E_CONTACT_EDITOR_PHONE_ID_ASSISTANT,
+	E_CONTACT_EDITOR_PHONE_ID_BUSINESS,
+	E_CONTACT_EDITOR_PHONE_ID_BUSINESS_2,
+	E_CONTACT_EDITOR_PHONE_ID_BUSINESS_FAX,
+	E_CONTACT_EDITOR_PHONE_ID_CALLBACK,
+	E_CONTACT_EDITOR_PHONE_ID_CAR,
+	E_CONTACT_EDITOR_PHONE_ID_COMPANY,
+	E_CONTACT_EDITOR_PHONE_ID_HOME,
+	E_CONTACT_EDITOR_PHONE_ID_HOME_2,
+	E_CONTACT_EDITOR_PHONE_ID_HOME_FAX,
+	E_CONTACT_EDITOR_PHONE_ID_ISDN,
+	E_CONTACT_EDITOR_PHONE_ID_MOBILE,
+	E_CONTACT_EDITOR_PHONE_ID_OTHER,
+	E_CONTACT_EDITOR_PHONE_ID_OTHER_FAX,
+	E_CONTACT_EDITOR_PHONE_ID_PAGER,
+	E_CONTACT_EDITOR_PHONE_ID_PRIMARY,
+	E_CONTACT_EDITOR_PHONE_ID_RADIO,
+	E_CONTACT_EDITOR_PHONE_ID_TELEX,
+	E_CONTACT_EDITOR_PHONE_ID_TTYTTD,
+	E_CONTACT_EDITOR_PHONE_ID_LAST
+};
+
+/* We need HOME and WORK email addresses here. */
+enum _EContactEditorEmailId {
+	E_CONTACT_EDITOR_EMAIL_ID_EMAIL,
+	E_CONTACT_EDITOR_EMAIL_ID_EMAIL_2,
+	E_CONTACT_EDITOR_EMAIL_ID_EMAIL_3,
+	E_CONTACT_EDITOR_EMAIL_ID_LAST
+};
+
+/* Should this include (BILLING/SHIPPING)? */
+enum _EContactEditorAddressId {
+	E_CONTACT_EDITOR_ADDRESS_ID_BUSINESS,
+	E_CONTACT_EDITOR_ADDRESS_ID_HOME,
+	E_CONTACT_EDITOR_ADDRESS_ID_OTHER,
+	E_CONTACT_EDITOR_ADDRESS_ID_LAST
+};
+
 #define E_CONTACT_EDITOR_TYPE			(e_contact_editor_get_type ())
 #define E_CONTACT_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_TYPE, EContactEditor))
 #define E_CONTACT_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_TYPE, EContactEditorClass))
@@ -66,6 +109,14 @@ struct _EContactEditor
 	GList *email_list;
 	GList *phone_list;
 	GList *address_list;
+
+	ECardPhone *phone[E_CONTACT_EDITOR_PHONE_ID_LAST];
+	char *email[E_CONTACT_EDITOR_EMAIL_ID_LAST];
+	ECardDeliveryAddress *address[E_CONTACT_EDITOR_ADDRESS_ID_LAST];
+
+	EContactEditorEmailId email_choice;
+	EContactEditorPhoneId phone_choice[4];
+	EContactEditorAddressId address_choice;
 };
 
 struct _EContactEditorClass