aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/backend/pas/pas-backend-ldap.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 7eb77f55b6..ed3aa7e828 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,12 @@
2003-01-23 Chris Toshok <toshok@ximian.com>
+ [ fixes bug #31014, roll this in from the 1.2 branch ]
+ * backend/pas/pas-backend-ldap.c: use "categories" instead of
+ "category" for the ECard field so the UI/get_supported_fields stuff
+ actually thinks its usable in the contact editor..
+
+2003-01-23 Chris Toshok <toshok@ximian.com>
+
* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): fix
for bug 34883 broke ssl transactions (at least those where we were
connecting to port 636). Move it to after the SSL stanza.
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
index 93bbd6cbd4..218f308f1f 100644
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ b/addressbook/backend/pas/pas-backend-ldap.c
@@ -268,7 +268,7 @@ struct prop_info {
E_STRING_PROP (E_CARD_SIMPLE_FIELD_MAILER, "mailer", "mailer"),
E_STRING_PROP (E_CARD_SIMPLE_FIELD_FILE_AS, "file_as", "fileAs"),
- E_COMPLEX_PROP (E_CARD_SIMPLE_FIELD_CATEGORIES, "category", "category", category_populate, category_ber, category_compare),
+ E_COMPLEX_PROP (E_CARD_SIMPLE_FIELD_CATEGORIES, "categories", "category", category_populate, category_ber, category_compare),
STRING_PROP (E_CARD_SIMPLE_FIELD_CALURI, "caluri", "calCalURI"),
STRING_PROP (E_CARD_SIMPLE_FIELD_FBURL, "fburl", "calFBURL"),