aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSushma Rai <rsushma@src.gnome.org>2005-08-22 17:56:07 +0800
committerSushma Rai <rsushma@src.gnome.org>2005-08-22 17:56:07 +0800
commit0bdf6224966e49369a8653318452902180d2e9e4 (patch)
tree8292fa54cb1b41efa966238d2c15a25ee65e9e96
parent7fa67251554c4867212bd8f33398fd8587db64d4 (diff)
downloadgsoc2013-evolution-0bdf6224966e49369a8653318452902180d2e9e4.tar
gsoc2013-evolution-0bdf6224966e49369a8653318452902180d2e9e4.tar.gz
gsoc2013-evolution-0bdf6224966e49369a8653318452902180d2e9e4.tar.bz2
gsoc2013-evolution-0bdf6224966e49369a8653318452902180d2e9e4.tar.lz
gsoc2013-evolution-0bdf6224966e49369a8653318452902180d2e9e4.tar.xz
gsoc2013-evolution-0bdf6224966e49369a8653318452902180d2e9e4.tar.zst
gsoc2013-evolution-0bdf6224966e49369a8653318452902180d2e9e4.zip
Fixes the crash while exporting contacts in csv format. Fixes #269870
svn path=/trunk/; revision=30194
-rw-r--r--addressbook/ChangeLog9
-rw-r--r--addressbook/tools/evolution-addressbook-export-list-cards.c18
2 files changed, 20 insertions, 7 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 234263b43f..36f38a7a6a 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,12 @@
+2005-08-22 Sushma Rai <rsushma@novell.com>
+
+ * tools/evolution-addressbook-export-list-cards.c
+ enum _EContactFieldCSV: Handling four e-mail ids.
+ enum _EContactCSVFieldData: Similar.
+ set_pre_defined_field: Similar.
+ Fixes the crash which was happening because list of email ids for a
+ contact was handled as a one email id value. Fixes #269870
+
2005-08-22 Sushma Rai <rsushma@novell.com>
* gui/contact-list-editor/e-contact-list-editor.c (remove_entry_cb):
diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c
index 758ed42eb2..5538b85b35 100644
--- a/addressbook/tools/evolution-addressbook-export-list-cards.c
+++ b/addressbook/tools/evolution-addressbook-export-list-cards.c
@@ -64,7 +64,10 @@ enum _EContactFieldCSV
{
E_CONTACT_CSV_FILE_AS,
E_CONTACT_CSV_FULL_NAME,
- E_CONTACT_CSV_EMAIL,
+ E_CONTACT_CSV_EMAIL_1,
+ E_CONTACT_CSV_EMAIL_2,
+ E_CONTACT_CSV_EMAIL_3,
+ E_CONTACT_CSV_EMAIL_4,
E_CONTACT_CSV_PHONE_PRIMARY,
E_CONTACT_CSV_PHONE_ASSISTANT,
E_CONTACT_CSV_PHONE_BUSINESS,
@@ -106,8 +109,6 @@ enum _EContactFieldCSV
E_CONTACT_CSV_ADDRESS_OTHER_REGION,
E_CONTACT_CSV_ADDRESS_OTHER_POSTCODE,
E_CONTACT_CSV_ADDRESS_OTHER_COUNTRY,
- E_CONTACT_CSV_EMAIL_2,
- E_CONTACT_CSV_EMAIL_3,
E_CONTACT_CSV_HOMEPAGE_URL,
E_CONTACT_CSV_ORG_UNIT,
E_CONTACT_CSV_OFFICE,
@@ -149,7 +150,10 @@ struct _EContactCSVFieldData
static EContactCSVFieldData csv_field_data[] = {
{E_CONTACT_CSV_FILE_AS, E_CONTACT_FILE_AS, ""},
{E_CONTACT_CSV_FULL_NAME, E_CONTACT_CSV_FULL_NAME, ""},
- {E_CONTACT_CSV_EMAIL, E_CONTACT_EMAIL, ""},
+ {E_CONTACT_CSV_EMAIL_1, E_CONTACT_EMAIL_1, ""},
+ {E_CONTACT_CSV_EMAIL_2, E_CONTACT_EMAIL_2, ""},
+ {E_CONTACT_CSV_EMAIL_3, E_CONTACT_EMAIL_3, ""},
+ {E_CONTACT_CSV_EMAIL_4, E_CONTACT_EMAIL_4, ""},
{E_CONTACT_CSV_PHONE_PRIMARY, E_CONTACT_PHONE_PRIMARY,
""},
{E_CONTACT_CSV_PHONE_ASSISTANT,
@@ -216,8 +220,6 @@ static EContactCSVFieldData csv_field_data[] = {
"Other Address PostCode"},
{E_CONTACT_CSV_ADDRESS_OTHER_COUNTRY, NOMAP,
"Other Address Country"},
- {E_CONTACT_CSV_EMAIL_2, E_CONTACT_EMAIL_2, ""},
- {E_CONTACT_CSV_EMAIL_3, E_CONTACT_EMAIL_3, ""},
{E_CONTACT_CSV_HOMEPAGE_URL, E_CONTACT_HOMEPAGE_URL, ""},
{E_CONTACT_CSV_ORG_UNIT, E_CONTACT_ORG_UNIT, ""},
{E_CONTACT_CSV_OFFICE, E_CONTACT_OFFICE, ""},
@@ -730,8 +732,10 @@ set_pre_defined_field (GSList ** pre_defined_fields)
*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_FAMILY_NAME));
*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_FULL_NAME));
*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_NICKNAME));
- *pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_EMAIL));
+ *pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_EMAIL_1));
*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_EMAIL_2));
+ *pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_EMAIL_3));
+ *pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_EMAIL_4));
*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_WANTS_HTML));
*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_PHONE_BUSINESS));
*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_PHONE_HOME));