[evolution-patches] [Addressbook] 61833, possible fix

[Hans Petter Jansson <hpj ximian com>]

I gave up trying to trigger this bug. Here's a patch that might fix it,
anyway.

-- 
Hans Petter

? 57795.patch
? 58921.patch
? 60529.patch
? 61833.patch
? 62085.patch
? 62142.patch
? 62715.patch
? birthdate.patch
? ce-use-gtkfilechooser.patch
? log.diff
? out.diff
? gui/component/ldap-config.gladep
? gui/component/old
? gui/component/out
? gui/component/select-names/crap
? gui/contact-editor/hpj-contact-editor.glade
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1816
diff -u -p -r1.1816 ChangeLog
--- ChangeLog	21 Aug 2004 21:53:41 -0000	1.1816
+++ ChangeLog	25 Aug 2004 04:41:23 -0000
@@ -1,3 +1,12 @@
+2004-08-24  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-20  Chris Toshok  <toshok ximian com>
 
 	* gui/component/component-factory.c (factory): remove the dead
Index: gui/component/select-names/e-select-names-table-model.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/select-names/e-select-names-table-model.c,v
retrieving revision 1.23
diff -u -p -r1.23 e-select-names-table-model.c
--- gui/component/select-names/e-select-names-table-model.c	9 Apr 2004 17:26:46 -0000	1.23
+++ gui/component/select-names/e-select-names-table-model.c	25 Aug 2004 04:41:23 -0000
@@ -121,7 +121,7 @@ fill_in_info (ESelectNamesTableModel *mo
 			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);