aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@src.gnome.org>2007-08-06 22:51:28 +0800
committerMilan Crha <mcrha@src.gnome.org>2007-08-06 22:51:28 +0800
commit4d5919868e1df48d6fbde3a870ccad5225887160 (patch)
treedea40d95e4d7e435b55381fa8b7638cf45e4469f
parent7b203f3d0b8ff6d78ba45cf5919b02be9e0f6424 (diff)
downloadgsoc2013-evolution-4d5919868e1df48d6fbde3a870ccad5225887160.tar.gz
gsoc2013-evolution-4d5919868e1df48d6fbde3a870ccad5225887160.tar.zst
gsoc2013-evolution-4d5919868e1df48d6fbde3a870ccad5225887160.zip
2007-08-06 mcrha Partial fix for bug #427469
svn path=/trunk/; revision=33959
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/importers/evolution-vcard-importer.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 2d1ee37c11..7740c27d42 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-06 Milan Crha <mcrha@redhat.com>
+
+ ** Partial fix for bug #427469
+
+ * importers/evolution-vcard-importer.c: (vcard_import_contact):
+ if HOME or WORK isn't specified for EMAIL, add TYPE=OTHER
+
2007-08-02 Hiroyuki Ikezoe <poincare@ikezoe.net>
** Fix for bug #462007
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
index cc614398db..4fc02e18f4 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -177,7 +177,7 @@ vcard_import_contact(VCardImporter *gci, EContact *contact)
}
/*
- Deal with ADR attributes that don't conform to what we need.
+ Deal with ADR and EMAIL attributes that don't conform to what we need.
if HOME or WORK isn't specified, add TYPE=OTHER.
*/
@@ -187,8 +187,8 @@ vcard_import_contact(VCardImporter *gci, EContact *contact)
gboolean no_location = TRUE;
GList *params, *param;
- if (g_ascii_strcasecmp (e_vcard_attribute_get_name (a),
- EVC_ADR))
+ if (g_ascii_strcasecmp (e_vcard_attribute_get_name (a), EVC_ADR) &&
+ g_ascii_strcasecmp (e_vcard_attribute_get_name (a), EVC_EMAIL))
continue;
params = e_vcard_attribute_get_params (a);