From 442ed02adb1d86a177b465fa656f2148a71230b1 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Mon, 25 Nov 2002 04:04:20 +0000 Subject: [ roll forward from the 1.2 branch. fixes #25540, part of #29630, as well 2002-11-23 Chris Toshok [ roll forward from the 1.2 branch. fixes #25540, part of #29630, as well as other selection issues in the contact editor and ACL issues in the ldap backend ] * backend/pas/pas-backend-ldap.c (check_schema_support): reset the schema check state to FALSE if the read returned nothing (and the user had not authenticated). we'll requery if/when they auth. (query_ldap_root_dse): free the schema dn before assigning over it. (pas_backend_ldap_connect): added a diagnostic warning about the root dse query failing in anonymous mode (if it in fact did fail.) (pas_backend_ldap_process_authenticate_user): if we successfully authed, requery the root dse to pick up any attributes that might be protected, and retry the schema query if that failed before. * gui/contact-editor/e-contact-editor.c (full_name_clicked): set the dialog's editable state based on the new field "fullname_editable", and only do the Ok button handling if this flag is TRUE. (full_addr_clicked): set the dialog's editable state based on the editable state for the particular address (from editor->address_editable[]). also, only do the Ok button handling if this flag is TRUE. (_address_arrow_pressed): use the address_editable array to determine whether the address text and the mailing address checkbutton are sensitive. (enable_writable_fields): figure out if fullname_editable is TRUE/FALSE, also, init the address_editable flags based on the field list, and handle the address checkbutton. * gui/contact-editor/fulladdr.glade: change the label names to label- to match {entry,combo}-. * gui/contact-editor/fullname.glade: same. * gui/contact-editor/e-contact-editor-fullname.c (e_contact_editor_fullname_class_init): rename ARG_IS_READ_ONLY to ARG_EDITABLE, to reflect the correct sense of the flag. (e_contact_editor_fullname_set_arg): same, and make the labels sensitive/insensitive depending on the editable state of the dialog. * gui/contact-editor/e-contact-editor-address.c (e_contact_editor_address_class_init): rename ARG_IS_READ_ONLY to ARG_EDITABLE, to reflect the correct sense of the flag. (e_contact_editor_address_set_arg): same, and make the labels sensitive/insensitive depending on the editable state of the dialog. svn path=/trunk/; revision=18910 --- addressbook/gui/contact-editor/fulladdr.glade | 832 +++++++++++++------------- 1 file changed, 419 insertions(+), 413 deletions(-) (limited to 'addressbook/gui/contact-editor/fulladdr.glade') diff --git a/addressbook/gui/contact-editor/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade index d8c43c5742..023c0b57be 100644 --- a/addressbook/gui/contact-editor/fulladdr.glade +++ b/addressbook/gui/contact-editor/fulladdr.glade @@ -1,440 +1,446 @@ - + - - no - Check Address - GTK_WINDOW_TOPLEVEL - yes - no - yes - GTK_WIN_POS_NONE - - - no - 8 - yes + + Check Address + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + True + True + False + True - - - GTK_BUTTONBOX_END - 8 - yes + + + True + False + 8 - - - yes - yes - yes - yes - gtk-ok - yes - yes - - + + + True + GTK_BUTTONBOX_END - - - yes - yes - yes - gtk-cancel - yes - yes - - - - - 0 - no - yes - GTK_PACK_END - - + + + True + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + 0 + + - - - 8 - no - 6 - 6 - 4 - 4 - yes + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + 0 + + + + + 0 + False + True + GTK_PACK_END + + - - - _Address: - GTK_JUSTIFY_LEFT - no - 1 - 0.5 - 0 - 0 - entry-street - yes - yes - - - 0 - 1 - 0 - 1 - 0 - 0 - fill - fill - - + + + 8 + True + 4 + 4 + False + 6 + 6 - - - _City: - GTK_JUSTIFY_CENTER - no - 1 - 0.5 - 0 - 0 - entry-city - yes - yes - - - 0 - 1 - 2 - 3 - 0 - 0 - fill - fill - - + + + True + _Address: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + entry-street + + + 0 + 1 + 0 + 1 + fill + fill + + - - - yes - yes - - 0 - yes - yes - - - 1 - 2 - 2 - 3 - 0 - 0 - expand|fill - fill - - + + + True + _City: + True + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + entry-city + + + 0 + 1 + 2 + 3 + fill + fill + + - - - yes - yes - - 100 - 0 - yes - yes - - - 1 - 2 - 1 - 2 - 0 - 0 - expand|fill - fill - - + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 2 + 3 + fill + + - - - _PO Box: - GTK_JUSTIFY_CENTER - no - 1 - 0.5 - 0 - 0 - entry-po - yes - yes - - - 2 - 3 - 1 - 2 - 0 - 0 - fill - fill - - + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 1 + 2 + fill + + - - - Address _2: - GTK_JUSTIFY_CENTER - no - 1 - 0.5 - 0 - 0 - entry-ext - yes - yes - - - 0 - 1 - 1 - 2 - 0 - 0 - fill - fill - - + + + True + _PO Box: + True + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + entry-po + + + 2 + 3 + 1 + 2 + fill + fill + + - - - yes - yes - - 100 - 0 - yes - yes - - - 3 - 4 - 1 - 2 - 0 - 0 - fill - fill - - + + + True + Address _2: + True + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + entry-ext + + + 0 + 1 + 1 + 2 + fill + fill + + - - - yes - yes - yes - - 0 - yes - yes - - - 1 - 4 - 0 - 1 - 0 - 0 - expand|fill - fill - - + + + True + True + True + True + 0 + + True + * + False + + + 3 + 4 + 1 + 2 + fill + fill + + - - - _State/Province: - GTK_JUSTIFY_CENTER - no - 1 - 0.5 - 0 - 0 - entry-region - yes - yes - - - 0 - 1 - 3 - 4 - 0 - 0 - fill - fill - - + + + True + True + True + True + True + 0 + + True + * + False + + + 1 + 4 + 0 + 1 + fill + + - - - yes - yes - - 0 - yes - yes - - - 1 - 2 - 3 - 4 - 0 - 0 - expand|fill - fill - - + + + True + _State/Province: + True + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + entry-region + + + 0 + 1 + 3 + 4 + fill + fill + + - - - yes - no - no - 100 - yes - no - yes - yes + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 3 + 4 + fill + + - - - yes - yes - - 0 - yes - yes - - + + + True + True + False + True + False + True + False - - - yes + + + True + True + True + True + 0 + + True + * + False + + - - - yes + + + True + GTK_SELECTION_BROWSE - - - - 0.0 - yes - - - - - - - - - 3 - 4 - 3 - 4 - 0 - 0 - fill - fill - - + + + True - - - yes - yes - - 100 - 0 - yes - yes - - - 3 - 4 - 2 - 3 - 0 - 0 - fill - fill - - + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + + + + + + + 3 + 4 + 3 + 4 + fill + fill + + - - - _ZIP Code: - GTK_JUSTIFY_CENTER - no - 1 - 0.5 - 0 - 0 - entry-code - yes - yes - - - 2 - 3 - 2 - 3 - 0 - 0 - fill - fill - - + + + True + True + True + True + 0 + + True + * + False + + + 3 + 4 + 2 + 3 + fill + fill + + + + + + True + _ZIP Code: + True + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + entry-code + + + 2 + 3 + 2 + 3 + fill + fill + + + + + + True + Countr_y: + True + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + entry-country + + + 2 + 3 + 3 + 4 + fill + fill + + + + + 0 + True + True + + + + + - - - Countr_y: - GTK_JUSTIFY_CENTER - no - 1 - 0.5 - 0 - 0 - entry-country - yes - yes - - - 2 - 3 - 3 - 4 - 0 - 0 - fill - fill - - - - - 0 - yes - yes - - - - - 4 - yes - yes - - - -- cgit v1.2.3