[evolution-patches] Addressbook - Fix for #269870
- From: Sushma Rai <rsushma novell com>
- To: Evolution Patches List <evolution-patches lists ximian com>
- Subject: [evolution-patches] Addressbook - Fix for #269870
- Date: Wed, 10 Aug 2005 17:33:35 +0530
ChangeLog explains the fix.
Please review.
Thanks,
Sushma.
Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1975
diff -u -p -r1.1975 ChangeLog
--- addressbook/ChangeLog 9 Aug 2005 22:40:59 -0000 1.1975
+++ addressbook/ChangeLog 10 Aug 2005 12:03:03 -0000
@@ -1,3 +1,12 @@
+2005-03-10 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-10 Tor Lillqvist <tml novell com>
* importers/Makefile.am: Use privsolib instead of privlib (no
Index: addressbook/tools/evolution-addressbook-export-list-cards.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/tools/evolution-addressbook-export-list-cards.c,v
retrieving revision 1.5
diff -u -p -r1.5 evolution-addressbook-export-list-cards.c
--- addressbook/tools/evolution-addressbook-export-list-cards.c 29 Jul 2005 05:46:30 -0000 1.5
+++ addressbook/tools/evolution-addressbook-export-list-cards.c 10 Aug 2005 12:03:10 -0000
@@ -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_da
"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_def
*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));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]