aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog9
-rw-r--r--addressbook/gui/component/select-names/e-select-names-table-model.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 6ea8afeb44..ca2a3f27e5 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,12 @@
+2004-08-25 Hans Petter Jansson <hpj@ximian.com>
+
+ May fix #61833.
+
+ * gui/component/select-names/e-select-names-table-model.c
+ (fill_in_info): Get E_CONTACT_NAME_OR_ORG (first found from File As,
+ Full Name, Organization, Email 1) for the "name" field. Hopefully
+ will prevent most cases of blank entries.
+
2004-08-25 Frederic Crozat <fcrozat@mandrakesoft.com>
* gui/component/addressbook-view.c: (delete_addressbook_cb):
diff --git a/addressbook/gui/component/select-names/e-select-names-table-model.c b/addressbook/gui/component/select-names/e-select-names-table-model.c
index 0072e7d9fd..dd824a6322 100644
--- a/addressbook/gui/component/select-names/e-select-names-table-model.c
+++ b/addressbook/gui/component/select-names/e-select-names-table-model.c
@@ -121,7 +121,7 @@ fill_in_info (ESelectNamesTableModel *model)
EContact *contact = dest ? e_destination_get_contact (dest) : NULL;
if (contact) {
- model->data[i].name = e_contact_get(contact, E_CONTACT_FILE_AS);
+ model->data[i].name = e_contact_get(contact, E_CONTACT_NAME_OR_ORG);
if (model->data[i].name == 0)
model->data[i].name = g_strdup("");
model->data[i].email = e_contact_get(contact, E_CONTACT_EMAIL_1);