From 99057deafb9038dd1f5cfc984b61a2ba3d99a99b Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Thu, 6 Dec 2001 19:54:01 +0000 Subject: we need to be able to disable non-labels here as well. since we're using 2001-12-05 Chris Toshok * gui/contact-editor/e-contact-editor.c (enable_writable_fields): we need to be able to disable non-labels here as well. since we're using enable_widget and not gtk_widget_set_sensitive, it's okay to handle entries/text's, etc, here. (widget_field_mappings): add label-caluri and label-fburl here. * gui/contact-editor/contact-editor.glade: change the label names for the freebusy/calendar urls to have more descriptive names, since we use them in e-contact-editor.c now. * backend/pas/pas-backend-ldap.c: add support for caluri/calendarURI, fburl/freeBusyURI. * backend/pas/evolutionperson.schema: add calendarURI and freeBusyURI. svn path=/trunk/; revision=14908 --- addressbook/backend/pas/evolutionperson.schema | 18 ++++++++++++++++-- addressbook/backend/pas/pas-backend-ldap.c | 4 +++- 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'addressbook/backend') diff --git a/addressbook/backend/pas/evolutionperson.schema b/addressbook/backend/pas/evolutionperson.schema index 76a975330e..f0f3a394df 100644 --- a/addressbook/backend/pas/evolutionperson.schema +++ b/addressbook/backend/pas/evolutionperson.schema @@ -167,6 +167,18 @@ attributetype ( 1.3.6.1.4.1.8506.1.2.25 SUP name SINGLE-VALUE ) +attributetype ( 1.3.6.1.4.1.8506.1.2.26 + NAME 'calendarURI' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.8506.1.2.27 + NAME 'freeBusyURI' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE ) + # evolutionPerson objectclass ( 1.3.6.1.4.1.8506.1.3.1 NAME 'evolutionPerson' @@ -178,7 +190,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 ) + radio $ telex $ tty $ categories $ calendarURI $ freeBusyURI ) ) # evolutionPersonList @@ -188,5 +200,7 @@ objectclass ( 1.3.6.1.4.1.8506.1.3.2 SUP top STRUCTURAL MUST ( - listName $ mail $ contact ) + listName ) + MAY ( + mail $ contact ) ) diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c index 3cec815753..0d18980c0f 100644 --- a/addressbook/backend/pas/pas-backend-ldap.c +++ b/addressbook/backend/pas/pas-backend-ldap.c @@ -226,7 +226,9 @@ struct prop_info { E_STRING_PROP (E_CARD_SIMPLE_FIELD_FILE_AS, "file_as", "fileAs"), E_STRING_PROP (E_CARD_SIMPLE_FIELD_CATEGORIES, "categories", "categories"), -/* E_CARD_SIMPLE_FIELD_FBURL, */ + E_STRING_PROP (E_CARD_SIMPLE_FIELD_CALURI, "caluri", "calendarURI"), + E_STRING_PROP (E_CARD_SIMPLE_FIELD_FBURL, "fburl", "freeBusyURI") + /* E_CARD_SIMPLE_FIELD_NAME_OR_ORG, */ -- cgit v1.2.3