aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/component/select-names/e-select-names-table-model.c
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@ximian.com>2001-03-29 07:37:46 +0800
committerChris Lahey <clahey@src.gnome.org>2001-03-29 07:37:46 +0800
commit954405749b2bf50cb17a3410b40aa8d24aec271d (patch)
treebd3321afb36c488dccfe6ba22347aa5d9e293b48 /addressbook/gui/component/select-names/e-select-names-table-model.c
parenta9819dd335216f7094b0057460e99de026d2ea57 (diff)
downloadgsoc2013-evolution-954405749b2bf50cb17a3410b40aa8d24aec271d.tar
gsoc2013-evolution-954405749b2bf50cb17a3410b40aa8d24aec271d.tar.gz
gsoc2013-evolution-954405749b2bf50cb17a3410b40aa8d24aec271d.tar.bz2
gsoc2013-evolution-954405749b2bf50cb17a3410b40aa8d24aec271d.tar.lz
gsoc2013-evolution-954405749b2bf50cb17a3410b40aa8d24aec271d.tar.xz
gsoc2013-evolution-954405749b2bf50cb17a3410b40aa8d24aec271d.tar.zst
gsoc2013-evolution-954405749b2bf50cb17a3410b40aa8d24aec271d.zip
Use E_CARD_SIMPLE_FIELD_NAME_OR_ORG instead of getting the NAME and then
2001-03-28 Christopher James Lahey <clahey@ximian.com> * gui/component/select-names/e-select-names-table-model.c (fill_in_info): Use E_CARD_SIMPLE_FIELD_NAME_OR_ORG instead of getting the NAME and then the ORG. That way if we expand NAME_OR_ORG, this will use it. * gui/component/select-names/e-select-names.c (e_addressbook_create_ebook_table, SPEC): Use the correct column in the SPEC. svn path=/trunk/; revision=9000
Diffstat (limited to 'addressbook/gui/component/select-names/e-select-names-table-model.c')
-rw-r--r--addressbook/gui/component/select-names/e-select-names-table-model.c5
1 files changed, 1 insertions, 4 deletions
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 7b0e27195b..be1f95cc98 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
@@ -120,10 +120,7 @@ fill_in_info (ESelectNamesTableModel *model)
if (card) {
ECardSimple *simple = e_card_simple_new(card);
- model->data[i].name = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);
- if ((model->data[i].name == 0) || *model->data[i].name == 0) {
- model->data[i].name = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);
- }
+ model->data[i].name = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_NAME_OR_ORG);
if (model->data[i].name == 0)
model->data[i].name = g_strdup("");
model->data[i].email = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_EMAIL);