aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog11
-rw-r--r--addressbook/backend/ebook/e-card.c8
-rw-r--r--addressbook/gui/search/e-addressbook-search-dialog.c5
3 files changed, 20 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index e05d693599..57b6c6be5a 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,14 @@
+2001-02-05 Christopher James Lahey <clahey@helixcode.com>
+
+ * backend/ebook/e-card.c (e_card_get_vcard): Make the Note field
+ be quoted printable.
+
+2001-01-27 Christopher James Lahey <clahey@helixcode.com>
+
+ * gui/search/e-addressbook-search-dialog.c
+ (e_addressbook_search_dialog_init): This should be a close button,
+ not a cancel button.
+
2001-02-04 Christopher James Lahey <clahey@ximian.com>
* gui/component/select-names/e-select-names-manager.c
diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c
index b48d2d44f7..b282d520fa 100644
--- a/addressbook/backend/ebook/e-card.c
+++ b/addressbook/backend/ebook/e-card.c
@@ -411,8 +411,12 @@ char
if (card->fburl)
addPropValue(vobj, "FBURL", card->fburl);
- if (card->note)
- addPropValue(vobj, VCNoteProp, card->note);
+ if (card->note) {
+ VObject *noteprop;
+
+ noteprop = addPropValue(vobj, VCNoteProp, card->note);
+ addProp(noteprop, VCQuotedPrintableProp);
+ }
if (card->categories) {
EIterator *iterator;
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c
index 20ac9c7413..f334b5e652 100644
--- a/addressbook/gui/search/e-addressbook-search-dialog.c
+++ b/addressbook/gui/search/e-addressbook-search-dialog.c
@@ -125,7 +125,6 @@ button_press (GtkWidget *widget, int button, EAddressbookSearchDialog *dialog)
char *query;
if (button == 0) {
- gtk_widget_show(dialog->scrolled_window);
query = get_query(dialog);
gtk_object_set(GTK_OBJECT(dialog->view),
"query", query,
@@ -149,7 +148,7 @@ e_addressbook_search_dialog_init (EAddressbookSearchDialog *view)
gnome_dialog_append_buttons(dialog,
_("Search"),
- GNOME_STOCK_BUTTON_CANCEL, NULL);
+ GNOME_STOCK_BUTTON_CLOSE, NULL);
gnome_dialog_set_default(dialog, 0);
@@ -164,6 +163,8 @@ e_addressbook_search_dialog_init (EAddressbookSearchDialog *view)
GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
gtk_container_add(GTK_CONTAINER(view->scrolled_window), view->view);
+ gtk_widget_show(view->scrolled_window);
+
gtk_box_pack_start(GTK_BOX(dialog->vbox), view->scrolled_window, TRUE, TRUE, 0);
}