From fd1851ec7a26dcce5d909eefde060bee7c643925 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Wed, 23 Aug 2000 09:34:53 +0000 Subject: Fix this to not mess up if the person passes a VCard with a carriage 2000-08-22 Christopher James Lahey * backend/ebook/e-card.c: Fix this to not mess up if the person passes a VCard with a carriage return in the mailing address. * gui/search/e-addressbook-search-dialog.c: Fix an error in the arguments to rule_context_load. svn path=/trunk/; revision=4983 --- addressbook/ChangeLog | 8 ++++++++ addressbook/backend/ebook/e-card.c | 1 + addressbook/gui/search/e-addressbook-search-dialog.c | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index bf42fea69f..14ffc2f9c2 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,11 @@ +2000-08-22 Christopher James Lahey + + * gui/search/e-addressbook-search-dialog.c: Fix an error in the + arguments to rule_context_load. + + * backend/ebook/e-card.c: Fix this to not mess up if the person + passes a VCard with a carriage return in the mailing address. + 2000-08-14 Not Zed * gui/search/addresstypes.xml: Fixed fullname->full_name for diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c index a81544dcd3..be18e1c359 100644 --- a/addressbook/backend/ebook/e-card.c +++ b/addressbook/backend/ebook/e-card.c @@ -295,6 +295,7 @@ char addPropValue(addressprop, VCPostalCodeProp, address->code); if ( address->country ) addPropValue(addressprop, VCCountryNameProp, address->country); + addProp(addressprop, VCQuotedPrintableProp); } gtk_object_unref(GTK_OBJECT(iterator)); } diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c index 0109b1914a..35ba3e5334 100644 --- a/addressbook/gui/search/e-addressbook-search-dialog.c +++ b/addressbook/gui/search/e-addressbook-search-dialog.c @@ -97,7 +97,7 @@ get_widget (EAddressbookSearchDialog *view) /* FIXME: hide this in a class */ rule_context_add_part_set(view->context, "partset", filter_part_get_type(), rule_context_add_part, rule_context_next_part); - rule_context_load(view->context, SEARCH_RULE_DIR "/addresstypes.xml", ""); + rule_context_load(view->context, SEARCH_RULE_DIR "/addresstypes.xml", "", NULL, NULL); view->rule = filter_rule_new(); part = rule_context_next_part(view->context, NULL); if (part == NULL) { -- cgit v1.2.3