|
 |
305df95 |
--- evolution-data-server-1.9.2/libedataserverui/e-name-selector-dialog.c.fix-name-selector-dialog 2006-11-08 11:23:52.000000000 -0500
|
|
|
305df95 |
+++ evolution-data-server-1.9.2/libedataserverui/e-name-selector-dialog.c 2006-11-08 11:45:54.000000000 -0500
|
|
|
305df95 |
@@ -1189,30 +1189,24 @@
|
|
|
305df95 |
{
|
|
|
305df95 |
EDestinationStore *destination_store = E_DESTINATION_STORE (model);
|
|
|
305df95 |
EDestination *destination;
|
|
|
305df95 |
- gchar *string;
|
|
|
305df95 |
+ GString *buffer;
|
|
|
305df95 |
|
|
|
305df95 |
destination = e_destination_store_get_destination (destination_store, iter);
|
|
|
305df95 |
g_assert (destination);
|
|
|
305df95 |
|
|
|
305df95 |
- if (e_destination_is_evolution_list (destination)) {
|
|
|
305df95 |
- if (e_destination_list_show_addresses (destination)) {
|
|
|
305df95 |
- const gchar *name;
|
|
|
305df95 |
- const gchar *addresses;
|
|
|
305df95 |
-
|
|
|
305df95 |
- name = e_destination_get_name (destination);
|
|
|
305df95 |
- addresses = e_destination_get_address (destination);
|
|
|
305df95 |
-
|
|
|
305df95 |
- string = g_strdup_printf ("%s%s(%s)", name ? name : "",
|
|
|
305df95 |
- name ? " " : "", addresses ? addresses : "?");
|
|
|
305df95 |
- } else {
|
|
|
305df95 |
- string = g_strdup (e_destination_get_name (destination));
|
|
|
305df95 |
- }
|
|
|
305df95 |
- } else {
|
|
|
305df95 |
- string = g_strdup (e_destination_get_address (destination));
|
|
|
305df95 |
+ buffer = g_string_new (e_destination_get_name (destination));
|
|
|
305df95 |
+
|
|
|
305df95 |
+ if (!e_destination_is_evolution_list (destination)) {
|
|
|
305df95 |
+ const gchar *email;
|
|
|
305df95 |
+
|
|
|
305df95 |
+ email = e_destination_get_email (destination);
|
|
|
305df95 |
+ if (email == NULL || *email == '\0')
|
|
|
305df95 |
+ email = "?";
|
|
|
305df95 |
+ g_string_append_printf (buffer, " <%s>", email);
|
|
|
305df95 |
}
|
|
|
305df95 |
|
|
|
305df95 |
- g_object_set (cell, "text", string, NULL);
|
|
|
305df95 |
- g_free (string);
|
|
|
305df95 |
+ g_object_set (cell, "text", buffer->str, NULL);
|
|
|
305df95 |
+ g_string_free (buffer, TRUE);
|
|
|
305df95 |
}
|
|
|
305df95 |
|
|
|
305df95 |
/* ----------------------- *
|