From 2839143b0b274ce88a7495a005109ab7d89e676d Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Wed, 28 Aug 2002 07:44:18 +0000 Subject: [ fixes #20348 ] deprecate "categories" in favor of "category". evolution 2002-08-28 Chris Toshok [ fixes #20348 ] * backend/pas/evolutionperson.schema: deprecate "categories" in favor of "category". evolution no longer uses "categories". * backend/pas/pas-backend-ldap.c (category_populate): new function, "category" is the new name, and it's multivalued so we need the complex-prop stuff.. (category_ber): new function, same. (category_compare): new function, same. * gui/component/addressbook.c (addressbook_search_activated): the text is "Category is" so we should use "is" instead of "contains" for the query. svn path=/trunk/; revision=17885 --- addressbook/backend/pas/evolutionperson.schema | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'addressbook/backend/pas/evolutionperson.schema') diff --git a/addressbook/backend/pas/evolutionperson.schema b/addressbook/backend/pas/evolutionperson.schema index 4b64b3b7e4..29270555ea 100644 --- a/addressbook/backend/pas/evolutionperson.schema +++ b/addressbook/backend/pas/evolutionperson.schema @@ -151,6 +151,7 @@ attributetype ( 1.3.6.1.4.1.8506.1.2.22 SUBSTR telephoneNumberSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) +# deprecated - use the multivalued category attributetype ( 1.3.6.1.4.1.8506.1.2.23 NAME 'categories' EQUALITY caseIgnoreMatch @@ -181,6 +182,13 @@ attributetype ( 1.3.6.1.4.1.8506.1.2.27 SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) +attributetype ( 1.3.6.1.4.1.8506.1.2.28 + NAME 'category' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{4096} ) + + # evolutionPerson objectclass ( 1.3.6.1.4.1.8506.1.3.1 NAME 'evolutionPerson' @@ -192,7 +200,7 @@ objectclass ( 1.3.6.1.4.1.8506.1.3.1 otherPhone $ businessRole $ managerName $ assistantName $ assistantPhone $ otherPostalAddress $ mailer $ birthDate $ anniversary $ spouseName $ note $ companyPhone $ callbackPhone $ otherFacsimileTelephoneNumber $ - radio $ telex $ tty $ categories $ calendarURI $ freeBusyURI ) + radio $ telex $ tty $ categories $ category $ calendarURI $ freeBusyURI ) ) # evolutionPersonList -- cgit