diff options
| author | Sushma Rai <rsushma@novell.com> | 2005-06-03 13:48:53 +0000 |
|---|---|---|
| committer | Ahmed Sarfraaz <sarfraaz@src.gnome.org> | 2005-06-03 13:48:53 +0000 |
| commit | a368db8cf75eef6022e2f7f18f97bfa05b111097 (patch) | |
| tree | 992d399852689e65b3266f489fbdf0302eedfc50 | |
| parent | de609e03b52ca05f8cf1ce5732808442ff501b50 (diff) | |
| download | evolution-data-server-a368db8cf75eef6022e2f7f18f97bfa05b111097.tar.gz | |
Using "full name" field instead of "file as", while displaying contacts in
2005-05-24 Sushma Rai <rsushma@novell.com>
* e-name-selector-dialog.c (contact_column_formatter): Using
"full name" field instead of "file as", while displaying contacts in
the name selector dialog.
Fixes #300290
| -rw-r--r-- | libedataserverui/ChangeLog | 7 | ||||
| -rw-r--r-- | libedataserverui/e-name-selector-dialog.c | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/libedataserverui/ChangeLog b/libedataserverui/ChangeLog index 16ff1fe30..a76b3999e 100644 --- a/libedataserverui/ChangeLog +++ b/libedataserverui/ChangeLog @@ -1,3 +1,10 @@ +2005-05-24 Sushma Rai <rsushma@novell.com> + + * e-name-selector-dialog.c (contact_column_formatter): Using + "full name" field instead of "file as", while displaying contacts in + the name selector dialog. + Fixes #300290 + 2005-05-12 Changwoo Ryu <cwryu@debian.org> Fixes #301116 diff --git a/libedataserverui/e-name-selector-dialog.c b/libedataserverui/e-name-selector-dialog.c index 6c091b34d..95598d2a5 100644 --- a/libedataserverui/e-name-selector-dialog.c +++ b/libedataserverui/e-name-selector-dialog.c @@ -846,7 +846,7 @@ contact_column_formatter (GtkTreeViewColumn *column, GtkCellRenderer *cell, GtkT GtkTreeIter contact_store_iter; GList *email_list; gchar *string; - gchar *file_as_str; + gchar *full_name_str; gchar *email_str; gint email_n; @@ -857,17 +857,17 @@ contact_column_formatter (GtkTreeViewColumn *column, GtkCellRenderer *cell, GtkT contact = e_contact_store_get_contact (contact_store, &contact_store_iter); email_list = e_contact_get (contact, E_CONTACT_EMAIL); email_str = g_list_nth_data (email_list, email_n); - file_as_str = e_contact_get (contact, E_CONTACT_FILE_AS); + full_name_str = e_contact_get (contact, E_CONTACT_FULL_NAME); if (e_contact_get (contact, E_CONTACT_IS_LIST)) { - string = g_strdup_printf ("%s", file_as_str ? file_as_str : "?"); + string = g_strdup_printf ("%s", full_name_str ? full_name_str : "?"); } else { - string = g_strdup_printf ("%s%s<%s>", file_as_str ? file_as_str : "", - file_as_str ? " " : "", + string = g_strdup_printf ("%s%s<%s>", full_name_str ? full_name_str : "", + full_name_str ? " " : "", email_str ? email_str : ""); } - g_free (file_as_str); + g_free (full_name_str); deep_free_list (email_list); g_object_set (cell, "text", string, NULL); |