File bnc-466331-contacts-fields.patch of Package evolution-data-server

Index: a/servers/groupwise/e-gw-item.c
===================================================================
--- a/servers/groupwise/e-gw-item.c	(revision 9919)
+++ a/servers/groupwise/e-gw-item.c	(working copy)
@@ -3410,8 +3410,31 @@
 	list = g_hash_table_lookup (changes, "ims");
 	if (list)
 		append_im_list_to_soap_message (list, msg);
-	append_phone_list_to_soap_message (changes, msg);
 
+	value = g_hash_table_lookup (changes, "default_phone");
+	if (value)
+		append_phone_list_to_soap_message (changes, msg);
+	
+	value = g_hash_table_lookup (changes, "phone_Office");  
+	if (value)
+		append_phone_list_to_soap_message (changes, msg);
+	
+	value = g_hash_table_lookup (changes, "phone_Home");
+	if (value)
+		append_phone_list_to_soap_message (changes, msg);
+
+	value = g_hash_table_lookup (changes, "phone_Pager");
+	if (value)
+		append_phone_list_to_soap_message (changes, msg);
+
+	value = g_hash_table_lookup (changes, "phone_Mobile");
+	if (value)
+		append_phone_list_to_soap_message (changes, msg);
+
+	value = g_hash_table_lookup (changes, "phone_Fax");
+	if (value)
+		append_phone_list_to_soap_message (changes, msg);
+
 	soup_soap_message_start_element (msg, "addressList", NULL, NULL);
 	postal_address = g_hash_table_lookup (changes, "Home");
 	if (postal_address)
Index: a/addressbook/backends/groupwise/e-book-backend-groupwise.c
===================================================================
--- a/addressbook/backends/groupwise/e-book-backend-groupwise.c	(revision 9919)
+++ a/addressbook/backends/groupwise/e-book-backend-groupwise.c	(working copy)
@@ -879,7 +879,7 @@
 	items = NULL;
 
 	if (count)
-		status = e_gw_connection_get_items (egwb->priv->cnc, egwb->priv->container_id, "name email default members", filter, &items);
+		status = e_gw_connection_get_items (egwb->priv->cnc, egwb->priv->container_id, "default members", filter, &items);
 
 	for (; items != NULL; items = g_list_next (items )) {
 		GList *emails;
@@ -1544,7 +1544,7 @@
 			return;
 		}
 		status = e_gw_connection_get_item (gwb->priv->cnc, gwb->priv->container_id, id,
-						   "name email default members", &item);
+						   "default members", &item);
 		if (status == E_GW_CONNECTION_STATUS_OK) {
 			if (item) {
 				contact = e_contact_new ();
@@ -2052,12 +2052,12 @@
 			if (ids && ids->len > 0) {
 				status = e_gw_connection_get_items_from_ids (egwb->priv->cnc,
 									egwb->priv->container_id,
-									"name email default members",
+									"default members",
 									ids, &gw_items);
 				if (status == E_GW_CONNECTION_STATUS_INVALID_CONNECTION)
 				status = e_gw_connection_get_items_from_ids (egwb->priv->cnc,
 									egwb->priv->container_id,
-									"name email default members",
+									"default members",
 									ids, &gw_items);
 			}
 			if (ids)
@@ -2073,12 +2073,12 @@
 				match_needed = FALSE;
 			status = e_gw_connection_get_items (egwb->priv->cnc,
 							    egwb->priv->container_id,
-							    "name email default members",
+							    "default members",
 							    filter, &gw_items);
 			if (status == E_GW_CONNECTION_STATUS_INVALID_CONNECTION)
 				status = e_gw_connection_get_items (egwb->priv->cnc,
 								    egwb->priv->container_id,
-								    "name email default members",
+								    "default members",
 								    filter, &gw_items);
 		}
 
@@ -2264,7 +2264,7 @@
 			g_get_current_time(&start);
 
 		filter = e_book_backend_groupwise_build_gw_filter (gwb, query, &is_auto_completion, &search_string);
-		view = "name email default members";
+		view = "default members";
 		if (is_auto_completion)
 			view = "name email";
 
@@ -2706,7 +2706,7 @@
 	}
 
 	status = e_gw_connection_create_cursor (priv->cnc, priv->container_id,
-						"name email default members", NULL, &cursor);
+						"default members", NULL, &cursor);
 	if (status != E_GW_CONNECTION_STATUS_OK) {
 		if (enable_debug)
 			printf("No connection with the server \n");
@@ -2881,7 +2881,7 @@
 	e_gw_filter_add_filter_component (filter, E_GW_FILTER_OP_GREATERTHAN,
 					  "modified", cache_time_string);
 	status = e_gw_connection_get_items (ebgw->priv->cnc, ebgw->priv->container_id,
-					    "name email default members", filter, &gw_items);
+					    "default members", filter, &gw_items);
 	if (status != E_GW_CONNECTION_STATUS_OK) {
 		if (book_view)
 			e_data_book_view_unref (book_view);
@@ -3116,7 +3116,7 @@
 					if(enable_debug)
 						printf ("Contact List modified fetching the members of the contact list\n");
 
-					status = e_gw_connection_get_item (ebgw->priv->cnc, ebgw->priv->container_id, e_contact_get (contact, E_CONTACT_UID), "name email default members", &item);
+					status = e_gw_connection_get_item (ebgw->priv->cnc, ebgw->priv->container_id, e_contact_get (contact, E_CONTACT_UID), "default members", &item);
 					g_object_unref (contact);
 					contact = e_contact_new ();
 					fill_contact_from_gw_item (contact, item, ebgw->priv->categories_by_id);