diff options
| -rw-r--r-- | addressbook/ChangeLog | 18 | ||||
| -rw-r--r-- | addressbook/backend/pas/evolutionperson.schema | 18 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-backend-ldap.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/contact-editor.glade | 4 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 5 |
5 files changed, 42 insertions, 7 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index eb833dc75f..d1288b2026 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,21 @@ +2001-12-05 Chris Toshok <toshok@ximian.com> + + * 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. + 2001-12-04 Christopher James Lahey <clahey@ximian.com> * gui/contact-editor/contact-editor.glade: Fixed up the 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, */ diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade index 7d9e7b1f7d..6e554c36ea 100644 --- a/addressbook/gui/contact-editor/contact-editor.glade +++ b/addressbook/gui/contact-editor/contact-editor.glade @@ -2403,7 +2403,7 @@ of that information here.</label> <widget> <class>GtkLabel</class> - <name>label22</name> + <name>label-caluri</name> <label>_Public Calendar URL:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -2430,7 +2430,7 @@ of that information here.</label> <widget> <class>GtkLabel</class> - <name>label23</name> + <name>label-fburl</name> <label>F_ree/Busy URL:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 90c81edef5..ea28563cc1 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -2169,7 +2169,10 @@ static struct { { "button-categories", E_CARD_SIMPLE_FIELD_CATEGORIES, TRUE }, { "entry-categories", E_CARD_SIMPLE_FIELD_CATEGORIES, TRUE }, + { "label-caluri", E_CARD_SIMPLE_FIELD_CALURI }, { "entry-caluri", E_CARD_SIMPLE_FIELD_CALURI, TRUE }, + + { "label-fburl", E_CARD_SIMPLE_FIELD_FBURL }, { "entry-fburl", E_CARD_SIMPLE_FIELD_FBURL, TRUE } }; static int num_widget_field_mappings = sizeof(widget_field_mappings) / sizeof (widget_field_mappings[0]); @@ -2285,8 +2288,6 @@ enable_writable_fields(EContactEditor *editor) widget_field_mappings[i].widget_name); continue; } - if (!GTK_IS_LABEL (w)) - continue; field = e_card_simple_get_ecard_field (simple, widget_field_mappings[i].field_id); |