Added related_contacts field.

2001-07-02  Christopher James Lahey  <clahey@ximian.com>

	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
	related_contacts field.

	* gui/component/select-names/e-select-names-model.c,
	gui/component/select-names/e-select-names-model.h
	(e_select_names_model_import_destinationv): Added this function.

	* gui/contact-editor/contact-editor.glade: Replaced the entry here
	for related contacts with a table which is filled in in the C code.

	* gui/contact-editor/e-contact-editor.c,
	gui/contact-editor/e-contact-editor.h (add_lists): Added a select
	names entry here for the related contacts field.

	* gui/widgets/Makefile.am: Removed all the test programs here
	since there are circular dependencies now.

svn path=/trunk/; revision=10666

2 files changed, 30 insertions, 6 deletions

diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c
index 88bc029ca2..044f27be3b 100644
--- a/addressbook/backend/ebook/e-card.c
+++ b/addressbook/backend/ebook/e-card.c
@@ -37,6 +37,7 @@
 #define XEV_ARBITRARY "X-EVOLUTION-ARBITRARY"
 #define XEV_LIST "X-EVOLUTION-LIST"
 #define XEV_LIST_SHOW_ADDRESSES "X-EVOLUTION-LIST-SHOW_ADDRESSES"
+#define XEV_RELATED_CONTACTS "X-EVOLUTION-RELATED_CONTACTS"
 
 /* Object argument IDs */
 enum {
@@ -63,6 +64,7 @@ enum {
 	ARG_MAILER,
 	ARG_FBURL,
 	ARG_NOTE,
+	ARG_RELATED_CONTACTS,
 	ARG_CATEGORIES,
 	ARG_CATEGORY_LIST,
 	ARG_WANTS_HTML,
@@ -112,6 +114,7 @@ static void parse_anniversary(ECard *card, VObject *object);
 static void parse_mailer(ECard *card, VObject *object);
 static void parse_fburl(ECard *card, VObject *object);
 static void parse_note(ECard *card, VObject *object);
+static void parse_related_contacts(ECard *card, VObject *object);
 static void parse_categories(ECard *card, VObject *object);
 static void parse_wants_html(ECard *card, VObject *object);
 static void parse_list(ECard *card, VObject *object);
@@ -154,6 +157,7 @@ struct {
 	{ VCMailerProp,              parse_mailer },
 	{ "FBURL",                   parse_fburl },
 	{ VCNoteProp,                parse_note },
+	{ XEV_RELATED_CONTACTS,      parse_related_contacts },
 	{ "CATEGORIES",              parse_categories },
 	{ XEV_WANTS_HTML,            parse_wants_html },
 	{ XEV_ARBITRARY,             parse_arbitrary },
@@ -509,6 +513,10 @@ e_card_get_vobject (ECard *card)
 		g_free (value);
 	}
 
+	if (card->related_contacts && *card->related_contacts) {
+		addPropValue(vobj, XEV_RELATED_CONTACTS, card->related_contacts);
+	}
+
 	if (card->categories) {
 		EIterator *iterator;
 		int length = 0;
@@ -909,6 +917,13 @@ parse_note(ECard *card, VObject *vobj)
 }
 
 static void
+parse_related_contacts(ECard *card, VObject *vobj)
+{
+	g_free(card->related_contacts);
+	assign_string(vobj, &(card->related_contacts));
+}
+
+static void
 add_list_unique(ECard *card, EList *list, char *string)
 {
 	char *temp = e_strdup_strip(string);
@@ -1193,6 +1208,8 @@ e_card_class_init (ECardClass *klass)
 				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FBURL);
 	gtk_object_add_arg_type ("ECard::note",
 				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_NOTE);
+	gtk_object_add_arg_type ("ECard::related_contacts",
+				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_RELATED_CONTACTS);
 	gtk_object_add_arg_type ("ECard::categories",
 				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_CATEGORIES);
 	gtk_object_add_arg_type ("ECard::category_list",
@@ -1772,7 +1789,8 @@ e_card_destroy (GtkObject *object)
 	g_free(card->anniversary);
 	g_free(card->fburl);
 	g_free(card->note);
-		
+	g_free(card->related_contacts);
+
 	if (card->categories)
 		gtk_object_unref(GTK_OBJECT(card->categories));
 	if (card->email)
@@ -1917,6 +1935,10 @@ e_card_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
 		g_free (card->note);
 		card->note = g_strdup(GTK_VALUE_STRING(*arg));
 		break;
+	case ARG_RELATED_CONTACTS:
+		g_free (card->related_contacts);
+		card->related_contacts = g_strdup(GTK_VALUE_STRING(*arg));
+		break;
 	case ARG_WANTS_HTML:
 		card->wants_html = GTK_VALUE_BOOL(*arg);
 		card->wants_html_set = TRUE;
@@ -2073,6 +2095,9 @@ e_card_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
 	case ARG_NOTE:
 		GTK_VALUE_STRING(*arg) = card->note;
 		break;
+	case ARG_RELATED_CONTACTS:
+		GTK_VALUE_STRING(*arg) = card->related_contacts;
+		break;
 	case ARG_WANTS_HTML:
 		GTK_VALUE_BOOL(*arg) = card->wants_html;
 		break;
@@ -2140,6 +2165,7 @@ e_card_init (ECard *card)
 	card->mailer = NULL;
 	card->fburl = NULL;
 	card->note = NULL;
+	card->related_contacts = NULL;
 	card->categories = NULL;
 	card->wants_html = FALSE;
 	card->wants_html_set = FALSE;
diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h
index d43f0666c2..d54d4c95fe 100644
--- a/addressbook/backend/ebook/e-card.h
+++ b/addressbook/backend/ebook/e-card.h
@@ -70,6 +70,8 @@ struct _ECard {
 	ECardDate       *last_use;
 	float            raw_use_score;
 
+	char            *related_contacts;  /* EDestinationV (serialized) of related contacts. */
+
 	EList           *categories;    /* Categories.                      */
 
 	EList           *arbitrary;     /* Arbitrary fields.                */
@@ -89,13 +91,9 @@ struct _ECard {
 	
 	ECard           *agent;         /* A person who sereves as this
 					   guy's agent/secretary/etc.       */
-	
 
-	char            *categories;    /* A list of the categories to which
-					   this card belongs.               */
-	
 	ECardSound      *sound;
-	
+
 	ECardKey        *key;	        /* The person's public key.         */
 	ECardTimeZone   *timezn;        /* The person's time zone.          */
 	ECardGeoPos     *geopos;        /* The person's long/lat.           */