Merge lp:~rodrigo-moya/evolution-couchdb/set-descriptions into lp:evolution-couchdb

[Rodrigo Moya]

[Rodrigo Moya (rodrigo-moya)]

Set the description for email addresses correctly

[Chad Miller (cmiller)]

Looks good.

My only complaint is that I hate integers mapped to true/false, as in the three strcmp()s. "String compare", on equality, returns zero -- which is false in C. I really want a comparison to zero, or at least a comment there explaining what it means.

review: Approve

[dobey (dobey)]

As already suggested, please use comparison against 0 for the strcmp/g_strcasecmp calls. Also, I think you might need to check that the return of e_vcard_attribute_param_get_name is not NULL, if it could ever return NULL, otherwise strcmp() will crash.

review: Needs Fixing

[lp:~rodrigo-moya/evolution-couchdb/set-descriptions]

43. By Rodrigo Moya on 2009-07-21

Handle NULL values with g_strcmp0 rather than plain strcmp

Unmerged revisions

43. By Rodrigo Moya on 2009-07-21

Handle NULL values with g_strcmp0 rather than plain strcmp

42. By Rodrigo Moya on 2009-07-21

Set the description for email addresses correctly

=== modified file 'addressbook/e-book-backend-couchdb.c'
--- addressbook/e-book-backend-couchdb.c	2009-07-01 16:03:33 +0000
+++ addressbook/e-book-backend-couchdb.c	2009-07-21 12:05:53 +0000
@@ -161,7 +161,7 @@
 {
 	EContactDate *dt;
 	GSList *list;
-	gint i;
+	GList *attr_list, *al;
 	const char *str;
 	CouchDBDocument *document;
 	EContactAddress *contact_address;
@@ -178,14 +178,44 @@
 
 	/* email addresses */
 	list = NULL;
-	for (i = E_CONTACT_FIRST_EMAIL_ID; i <= E_CONTACT_LAST_EMAIL_ID; i++) {
+	attr_list = e_contact_get_attributes (contact, E_CONTACT_EMAIL);
+	for (al = attr_list; al != NULL; al = al->next) {
 		const gchar *email;
+		EVCardAttribute *attr = (EVCardAttribute *) al->data;
 
-		email = e_contact_get_const (contact, i);
+		email = e_vcard_attribute_get_value (attr);
 		if (email) {
 			CouchDBStructField *sf;
-
-			sf = couchdb_document_contact_email_new (email, /* FIXME */ NULL);
+			GList *params;
+			const gchar *description = NULL;
+
+			params = e_vcard_attribute_get_params (attr);
+			if (params) {
+				GList *pl;
+
+				for (pl = params; pl != NULL; pl = pl->next) {
+					GList *v;
+					EVCardAttributeParam *p = pl->data;
+
+					if (strcmp (EVC_TYPE, e_vcard_attribute_param_get_name (p)))
+						continue;
+
+					v = e_vcard_attribute_param_get_values (p);
+					while (v && v->data) {
+						if (!g_ascii_strcasecmp ((const gchar *) v->data, "HOME")) {
+							description = "home";
+							break;
+						} else if (!g_ascii_strcasecmp ((const gchar *) v->data, "WORK")) {
+							description = "work";
+							break;
+						}
+
+						v = v->next;
+					}
+				}
+			}
+
+			sf = couchdb_document_contact_email_new (email, description);
 			list = g_slist_append (list, sf);
 		}
 	}