Index: e-name-selector-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-name-selector-dialog.c,v
retrieving revision 1.35
diff -u -8 -p -r1.35 e-name-selector-dialog.c
--- e-name-selector-dialog.c	17 Aug 2006 09:44:48 -0000	1.35
+++ e-name-selector-dialog.c	25 Sep 2006 15:26:46 -0000
@@ -1186,45 +1186,49 @@ contact_column_formatter (GtkTreeViewCol
 
 	g_free (full_name_str);
 	deep_free_list (email_list);
 
 	g_object_set (cell, "text", string, NULL);
 	g_free (string);
 }
 
+
+/* modified destination_column_formatter to resemble contact_column_formatter in working */
 static void
 destination_column_formatter (GtkTreeViewColumn *column, GtkCellRenderer *cell, GtkTreeModel *model,
 			      GtkTreeIter *iter, ENameSelectorDialog *name_selector_dialog)
 {
 	EDestinationStore *destination_store = E_DESTINATION_STORE (model);
 	EDestination      *destination;
 	gchar             *string;
+	const gchar *name;
+	const gchar *email;
 
        	destination = e_destination_store_get_destination (destination_store, iter);
 	g_assert (destination);
 
 	if (e_destination_is_evolution_list (destination)) {
 		if (e_destination_list_show_addresses (destination)) {
 			const gchar *name;
-			const gchar *addresses;
 
 			name      = e_destination_get_name (destination);
-			addresses = e_destination_get_address (destination);
 
-			string = g_strdup_printf ("%s%s(%s)", name ? name : "",
-						  name ? " " : "", addresses ? addresses : "?");
+			string = g_strdup_printf ("%s", name ? name : "?");
 		} else {
 			string = g_strdup (e_destination_get_name (destination));
 		}
 	} else {
-		string = g_strdup (e_destination_get_address (destination));
+		name = e_destination_get_name (destination);
+		email = e_destination_get_email (destination);
+		string = g_strdup_printf ("%s%s<%s>", name ? name : "", name ? " " : "", email ? email : "");
 	}
 
 	g_object_set (cell, "text", string, NULL);
+
 	g_free (string);
 }
 
 /* ----------------------- *
  * ENameSelectorDialog API *
  * ----------------------- */
 
 /**
