[evolution-patches] groupwise additions to e-contact

From: Chris Toshok <toshok ximian com>
To: evolution-patches ximian com
Subject: [evolution-patches] groupwise additions to e-contact
Date: Thu, 26 Feb 2004 08:26:56 -0800

The list attribute was added but not the 6 convenience synthetic
work/home fields.  This patch adds them.

Chris

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/ChangeLog,v
retrieving revision 1.96
diff -u -r1.96 ChangeLog
--- ChangeLog	26 Feb 2004 15:54:09 -0000	1.96
+++ ChangeLog	26 Feb 2004 16:25:11 -0000
@@ -1,3 +1,11 @@
+2004-02-26  Chris Toshok  <toshok ximian com>
+
+	* libebook/e-contact.h: add
+	E_CONTACT_IM_GROUPWISE_{HOME,WORK}_{1,2,3}.
+
+	* libebook/e-contact.c: add attributes
+	E_CONTACT_IM_GROUPWISE_{HOME,WORK}_{1,2,3}.
+
 2004-02-25  Chris Toshok  <toshok ximian com>
 
 	* libebook/e-vcard.c (e_vcard_attribute_is_single_valued):
Index: libebook/e-contact.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-contact.c,v
retrieving revision 1.25
diff -u -r1.25 e-contact.c
--- libebook/e-contact.c	26 Feb 2004 15:54:10 -0000	1.25
+++ libebook/e-contact.c	26 Feb 2004 16:25:12 -0000
@@ -149,12 +149,12 @@
 	BOOLEAN_FIELD        (E_CONTACT_WANTS_HTML, EVC_X_WANTS_HTML, "wants_html", N_("Wants HTML Mail"), FALSE),
 
 	/* Instant messaging fields */
-	MULTI_LIST_FIELD (E_CONTACT_IM_AIM,    EVC_X_AIM,    "im_aim",    N_("AIM Screen Name List"),    FALSE),
-	MULTI_LIST_FIELD (E_CONTACT_IM_JABBER, EVC_X_JABBER, "im_jabber", N_("Jabber Id List"),          FALSE),
-	MULTI_LIST_FIELD (E_CONTACT_IM_YAHOO,  EVC_X_YAHOO,  "im_yahoo",  N_("Yahoo! Screen Name List"), FALSE),
-	MULTI_LIST_FIELD (E_CONTACT_IM_MSN,    EVC_X_MSN,    "im_msn",    N_("MSN Screen Name List"),    FALSE),
-	MULTI_LIST_FIELD (E_CONTACT_IM_ICQ,    EVC_X_ICQ,    "im_icq",    N_("ICQ Id List"),             FALSE),
-        MULTI_LIST_FIELD (E_CONTACT_IM_GROUPWISE, EVC_X_GROUPWISE, "im_groupwise", N_("Groupwise Id List"), FALSE),
+	MULTI_LIST_FIELD (E_CONTACT_IM_AIM,       EVC_X_AIM,       "im_aim",       N_("AIM Screen Name List"),    FALSE),
+        MULTI_LIST_FIELD (E_CONTACT_IM_GROUPWISE, EVC_X_GROUPWISE, "im_groupwise", N_("Groupwise Id List"),       FALSE),
+	MULTI_LIST_FIELD (E_CONTACT_IM_JABBER, 	  EVC_X_JABBER,    "im_jabber",    N_("Jabber Id List"),          FALSE),
+	MULTI_LIST_FIELD (E_CONTACT_IM_YAHOO,  	  EVC_X_YAHOO,     "im_yahoo",     N_("Yahoo! Screen Name List"), FALSE),
+	MULTI_LIST_FIELD (E_CONTACT_IM_MSN,    	  EVC_X_MSN,       "im_msn",       N_("MSN Screen Name List"),    FALSE),
+	MULTI_LIST_FIELD (E_CONTACT_IM_ICQ,    	  EVC_X_ICQ,       "im_icq",       N_("ICQ Id List"),             FALSE),
  
 	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_AIM_HOME_1,    EVC_X_AIM,    "im_aim_home_1",    N_("AIM Home Screen Name 1"),    FALSE, "HOME", 0),
 	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_AIM_HOME_2,    EVC_X_AIM,    "im_aim_home_2",    N_("AIM Home Screen Name 2"),    FALSE, "HOME", 1),
@@ -162,6 +162,12 @@
 	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_AIM_WORK_1,    EVC_X_AIM,    "im_aim_work_1",    N_("AIM Work Screen Name 1"),    FALSE, "WORK", 0),
 	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_AIM_WORK_2,    EVC_X_AIM,    "im_aim_work_2",    N_("AIM Work Screen Name 2"),    FALSE, "WORK", 1),
 	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_AIM_WORK_3,    EVC_X_AIM,    "im_aim_work_3",    N_("AIM Work Screen Name 3"),    FALSE, "WORK", 2),
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_HOME_1, EVC_X_GROUPWISE, "im_groupwise_home_1", N_("Groupwise Home Screen Name 1"),    FALSE, "HOME", 0),
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_HOME_2, EVC_X_GROUPWISE, "im_groupwise_home_2", N_("Groupwise Home Screen Name 2"),    FALSE, "HOME", 1),
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_HOME_3, EVC_X_GROUPWISE, "im_groupwise_home_3", N_("Groupwise Home Screen Name 3"),    FALSE, "HOME", 2),
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_WORK_1, EVC_X_GROUPWISE, "im_groupwise_work_1", N_("Groupwise Work Screen Name 1"),    FALSE, "WORK", 0),
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_WORK_2, EVC_X_GROUPWISE, "im_groupwise_work_2", N_("Groupwise Work Screen Name 2"),    FALSE, "WORK", 1),
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_WORK_3, EVC_X_GROUPWISE, "im_groupwise_work_3", N_("Groupwise Work Screen Name 3"),    FALSE, "WORK", 2),
 	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_JABBER_HOME_1, EVC_X_JABBER, "im_jabber_home_1", N_("Jabber Home Id 1"),          FALSE, "HOME", 0),
 	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_JABBER_HOME_2, EVC_X_JABBER, "im_jabber_home_2", N_("Jabber Home Id 2"),          FALSE, "HOME", 1),
 	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_JABBER_HOME_3, EVC_X_JABBER, "im_jabber_home_3", N_("Jabber Home Id 3"),          FALSE, "HOME", 2),
Index: libebook/e-contact.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-contact.h,v
retrieving revision 1.12
diff -u -r1.12 e-contact.h
--- libebook/e-contact.h	26 Feb 2004 15:54:10 -0000	1.12
+++ libebook/e-contact.h	26 Feb 2004 16:25:12 -0000
@@ -101,36 +101,42 @@
 	E_CONTACT_SPOUSE,        /* string field */
 	E_CONTACT_NOTE,          /* string field */
 
-	E_CONTACT_IM_AIM_HOME_1,     /* Synthetic string field */
-	E_CONTACT_IM_AIM_HOME_2,     /* Synthetic string field */
-	E_CONTACT_IM_AIM_HOME_3,     /* Synthetic string field */
-	E_CONTACT_IM_AIM_WORK_1,     /* Synthetic string field */
-	E_CONTACT_IM_AIM_WORK_2,     /* Synthetic string field */
-	E_CONTACT_IM_AIM_WORK_3,     /* Synthetic string field */
-	E_CONTACT_IM_JABBER_HOME_1,  /* Synthetic string field */
-	E_CONTACT_IM_JABBER_HOME_2,  /* Synthetic string field */
-	E_CONTACT_IM_JABBER_HOME_3,  /* Synthetic string field */
-	E_CONTACT_IM_JABBER_WORK_1,  /* Synthetic string field */
-	E_CONTACT_IM_JABBER_WORK_2,  /* Synthetic string field */
-	E_CONTACT_IM_JABBER_WORK_3,  /* Synthetic string field */
-	E_CONTACT_IM_YAHOO_HOME_1,   /* Synthetic string field */
-	E_CONTACT_IM_YAHOO_HOME_2,   /* Synthetic string field */
-	E_CONTACT_IM_YAHOO_HOME_3,   /* Synthetic string field */
-	E_CONTACT_IM_YAHOO_WORK_1,   /* Synthetic string field */
-	E_CONTACT_IM_YAHOO_WORK_2,   /* Synthetic string field */
-	E_CONTACT_IM_YAHOO_WORK_3,   /* Synthetic string field */
-	E_CONTACT_IM_MSN_HOME_1,     /* Synthetic string field */
-	E_CONTACT_IM_MSN_HOME_2,     /* Synthetic string field */
-	E_CONTACT_IM_MSN_HOME_3,     /* Synthetic string field */
-	E_CONTACT_IM_MSN_WORK_1,     /* Synthetic string field */
-	E_CONTACT_IM_MSN_WORK_2,     /* Synthetic string field */
-	E_CONTACT_IM_MSN_WORK_3,     /* Synthetic string field */
-	E_CONTACT_IM_ICQ_HOME_1,     /* Synthetic string field */
-	E_CONTACT_IM_ICQ_HOME_2,     /* Synthetic string field */
-	E_CONTACT_IM_ICQ_HOME_3,     /* Synthetic string field */
-	E_CONTACT_IM_ICQ_WORK_1,     /* Synthetic string field */
-	E_CONTACT_IM_ICQ_WORK_2,     /* Synthetic string field */
-	E_CONTACT_IM_ICQ_WORK_3,     /* Synthetic string field */
+	E_CONTACT_IM_AIM_HOME_1,       /* Synthetic string field */
+	E_CONTACT_IM_AIM_HOME_2,       /* Synthetic string field */
+	E_CONTACT_IM_AIM_HOME_3,       /* Synthetic string field */
+	E_CONTACT_IM_AIM_WORK_1,       /* Synthetic string field */
+	E_CONTACT_IM_AIM_WORK_2,       /* Synthetic string field */
+	E_CONTACT_IM_AIM_WORK_3,       /* Synthetic string field */
+	E_CONTACT_IM_GROUPWISE_HOME_1, /* Synthetic string field */
+	E_CONTACT_IM_GROUPWISE_HOME_2, /* Synthetic string field */
+	E_CONTACT_IM_GROUPWISE_HOME_3, /* Synthetic string field */
+	E_CONTACT_IM_GROUPWISE_WORK_1, /* Synthetic string field */
+	E_CONTACT_IM_GROUPWISE_WORK_2, /* Synthetic string field */
+	E_CONTACT_IM_GROUPWISE_WORK_3, /* Synthetic string field */
+	E_CONTACT_IM_JABBER_HOME_1,    /* Synthetic string field */
+	E_CONTACT_IM_JABBER_HOME_2,    /* Synthetic string field */
+	E_CONTACT_IM_JABBER_HOME_3,    /* Synthetic string field */
+	E_CONTACT_IM_JABBER_WORK_1,    /* Synthetic string field */
+	E_CONTACT_IM_JABBER_WORK_2,    /* Synthetic string field */
+	E_CONTACT_IM_JABBER_WORK_3,    /* Synthetic string field */
+	E_CONTACT_IM_YAHOO_HOME_1,     /* Synthetic string field */
+	E_CONTACT_IM_YAHOO_HOME_2,     /* Synthetic string field */
+	E_CONTACT_IM_YAHOO_HOME_3,     /* Synthetic string field */
+	E_CONTACT_IM_YAHOO_WORK_1,     /* Synthetic string field */
+	E_CONTACT_IM_YAHOO_WORK_2,     /* Synthetic string field */
+	E_CONTACT_IM_YAHOO_WORK_3,     /* Synthetic string field */
+	E_CONTACT_IM_MSN_HOME_1,       /* Synthetic string field */
+	E_CONTACT_IM_MSN_HOME_2,       /* Synthetic string field */
+	E_CONTACT_IM_MSN_HOME_3,       /* Synthetic string field */
+	E_CONTACT_IM_MSN_WORK_1,       /* Synthetic string field */
+	E_CONTACT_IM_MSN_WORK_2,       /* Synthetic string field */
+	E_CONTACT_IM_MSN_WORK_3,       /* Synthetic string field */
+	E_CONTACT_IM_ICQ_HOME_1,       /* Synthetic string field */
+	E_CONTACT_IM_ICQ_HOME_2,       /* Synthetic string field */
+	E_CONTACT_IM_ICQ_HOME_3,       /* Synthetic string field */
+	E_CONTACT_IM_ICQ_WORK_1,       /* Synthetic string field */
+	E_CONTACT_IM_ICQ_WORK_2,       /* Synthetic string field */
+	E_CONTACT_IM_ICQ_WORK_3,       /* Synthetic string field */
 
 	/* Convenience field for getting a name from the contact.
 	   Returns the first one of [File-As, Full Name, Org, Email1]
@@ -154,7 +160,7 @@
 
 	/* Instant Messaging fields */
 	E_CONTACT_IM_AIM,     	 /* Multi-valued */
-	E_CONTACT_IM_GROUPWISE,   /* Multi-valued */
+	E_CONTACT_IM_GROUPWISE,  /* Multi-valued */
 	E_CONTACT_IM_JABBER,  	 /* Multi-valued */
 	E_CONTACT_IM_YAHOO,   	 /* Multi-valued */
 	E_CONTACT_IM_MSN,     	 /* Multi-valued */
@@ -173,7 +179,7 @@
 	E_CONTACT_ANNIVERSARY,   /* structured field (EContactDate) */
 
 	/* Security Fields */
-	E_CONTACT_X509_CERT,                  /* structured field (EContactCert) */
+	E_CONTACT_X509_CERT,     /* structured field (EContactCert) */
 
 	E_CONTACT_FIELD_LAST,

Follow-Ups:
- Re: [evolution-patches] groupwise additions to e-contact
  - From: Hans Petter Jansson

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]