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

Add helper func. (process_item_fn): Add undisplayed fields to notes.

Browse Source 
2004-05-20  Hans Petter Jansson  <hpj@ximian.com>

	* importers/evolution-ldif-importer.c (add_to_notes): Add helper
	func.
	(process_item_fn): Add undisplayed fields to notes.

	* importers/evolution-vcard-importer.c (add_to_notes): Add helper
	func.
	(process_item_fn): Add undisplayed fields to notes.

svn path=/trunk/; revision=26025
This commit is contained in:
Hans Petter Jansson
2004-05-21 00:17:44 +00:00
committed by Hans Petter
parent 6ca92599a2
commit d4329193ff
3 changed files with 70 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
addressbook/ChangeLog
View File

@ -1,3 +1,13 @@
2004-05-20 Hans Petter Jansson <hpj@ximian.com>
* importers/evolution-ldif-importer.c (add_to_notes): Add helper
func.
(process_item_fn): Add undisplayed fields to notes.
* importers/evolution-vcard-importer.c (add_to_notes): Add helper
func.
(process_item_fn): Add undisplayed fields to notes.
2004-05-20 Hans Petter Jansson <hpj@ximian.com>
* gui/component/addressbook-migrate.c (add_to_notes): Implement.

31
addressbook/importers/evolution-ldif-importer.c
View File

@ -428,6 +428,30 @@ create_contacts_from_ldif (const char *filename)
return list;
}
static void
add_to_notes (EContact *contact, EContactField field)
{
const gchar *old_text;
const gchar *field_text;
gchar *new_text;
old_text = e_contact_get_const (contact, E_CONTACT_NOTE);
if (old_text && strstr (old_text, e_contact_pretty_name (field)))
return;
field_text = e_contact_get_const (contact, field);
if (!field_text || !*field_text)
return;
new_text = g_strdup_printf ("%s%s%s: %s",
old_text ? old_text : "",
old_text && *old_text &&
*(old_text + strlen (old_text) - 1) != '\n' ? "\n" : "",
e_contact_pretty_name (field), field_text);
e_contact_set (contact, E_CONTACT_NOTE, new_text);
g_free (new_text);
}
/* EvolutionImporter methods */
static void
process_item_fn (EvolutionImporter *importer,
@ -459,6 +483,13 @@ process_item_fn (EvolutionImporter *importer,
contact = gci->iterator->data;
if (e_contact_get (contact, E_CONTACT_IS_LIST))
resolve_list_card (gci, contact);
else {
/* Work around the fact that these fields no longer show up in the UI */
add_to_notes (contact, E_CONTACT_OFFICE);
add_to_notes (contact, E_CONTACT_SPOUSE);
add_to_notes (contact, E_CONTACT_BLOG_URL);
}
/* FIXME Error checking */
e_book_add_contact (gci->book, contact, NULL);

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

@ -60,6 +60,30 @@ typedef struct {
gboolean ready;
} VCardImporter;
static void
add_to_notes (EContact *contact, EContactField field)
{
const gchar *old_text;
const gchar *field_text;
gchar *new_text;
old_text = e_contact_get_const (contact, E_CONTACT_NOTE);
if (old_text && strstr (old_text, e_contact_pretty_name (field)))
return;
field_text = e_contact_get_const (contact, field);
if (!field_text || !*field_text)
return;
new_text = g_strdup_printf ("%s%s%s: %s",
old_text ? old_text : "",
old_text && *old_text &&
*(old_text + strlen (old_text) - 1) != '\n' ? "\n" : "",
e_contact_pretty_name (field), field_text);
e_contact_set (contact, E_CONTACT_NOTE, new_text);
g_free (new_text);
}
/* EvolutionImporter methods */
static void
process_item_fn (EvolutionImporter *importer,
@ -125,6 +149,11 @@ process_item_fn (EvolutionImporter *importer,
}
e_contact_set_attributes (contact, E_CONTACT_EMAIL, attrs);
/* Work around the fact that these fields no longer show up in the UI */
add_to_notes (contact, E_CONTACT_OFFICE);
add_to_notes (contact, E_CONTACT_SPOUSE);
add_to_notes (contact, E_CONTACT_BLOG_URL);
/* FIXME Error checking */
e_book_add_contact (gci->book, contact, NULL);