callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consider full name and also the first part of e-mail address for

Browse Source 
contact description in the import dialogue.
This commit is contained in:
Fridrich Štrba
2010-05-20 14:24:06 +02:00
parent 428f26b128
commit 71c0e4e0c2
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
addressbook/importers/evolution-vcard-importer.c
View File

@ -868,6 +868,7 @@ evolution_contact_importer_get_preview_widget (const GList *contacts)
for (c = contacts; c; c = c->next) {
const gchar *description;
gchar *free_description = NULL;
EContact *contact = (EContact *) c->data;
if (!contact || !E_IS_CONTACT (contact))
@ -876,12 +877,26 @@ evolution_contact_importer_get_preview_widget (const GList *contacts)
description = e_contact_get_const (contact, E_CONTACT_FILE_AS);
if (!description)
description = e_contact_get_const (contact, E_CONTACT_UID);
if (!description)
description = e_contact_get_const (contact, E_CONTACT_FULL_NAME);
if (!description) {
description = e_contact_get_const (contact, E_CONTACT_EMAIL_1);
if (description) {
const gchar *at = strchr (description, '@');
if (at) {
free_description = g_strndup (description, (gsize)(at - description));
description = free_description;
}
}
}
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
0, description ? description : "",
1, contact,
-1 );
g_free (free_description);
}
if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)) {