662,674c662,671
< 	// FIX - dond, 27. 1. 2010
< 	if(item){
< 		full_name = e_gw_item_get_full_name (item);
< 		if (full_name) {
< 			full_name_string = g_strconcat ( (full_name->first_name == NULL) ? "\0" :    full_name->first_name, " ",
< 				    (full_name->middle_name == NULL) ? "\0" : full_name->middle_name, " ",
< 				    full_name->last_name == NULL ? "\0" : full_name->last_name, " ",
< 				    (full_name->name_suffix == NULL ) ? "\0" : full_name->name_suffix, NULL);
< 			full_name_string = g_strstrip (full_name_string);
< 			if (!g_str_equal (full_name_string, "\0"))
< 				e_contact_set (contact, E_CONTACT_FULL_NAME, full_name_string);
< 			g_free (full_name_string);
< 		}
---
> 	full_name = e_gw_item_get_full_name (item);
> 	if (full_name) {
> 		full_name_string = g_strconcat ( (full_name->first_name == NULL) ? "\0" :    full_name->first_name, " ",
> 			    (full_name->middle_name == NULL) ? "\0" : full_name->middle_name, " ",
> 			    full_name->last_name == NULL ? "\0" : full_name->last_name, " ",
> 			    (full_name->name_suffix == NULL ) ? "\0" : full_name->name_suffix, NULL);
> 		full_name_string = g_strstrip (full_name_string);
> 		if (!g_str_equal (full_name_string, "\0"))
> 			e_contact_set (contact, E_CONTACT_FULL_NAME, full_name_string);
> 		g_free (full_name_string);
3017,3020c3014,3016
< 				if(delete_list->data)
< 					fill_contact_from_gw_item (contact,
< 								   E_GW_ITEM (delete_list->data),
< 								   ebgw->priv->categories_by_id);
---
> 				fill_contact_from_gw_item (contact,
> 							   E_GW_ITEM (delete_list->data),
> 							   ebgw->priv->categories_by_id);
