From 3f4b0efb112cdc935ababe0647b0a4906a1d4748 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Mon, 21 Jun 2004 21:49:01 +0000 Subject: remove the auth-entry-notebook in the edit dialog, and rename the auth 2004-06-21 Chris Toshok * gui/component/ldap-config.glade: remove the auth-entry-notebook in the edit dialog, and rename the auth entry to... auth-entry. * gui/component/addressbook-config.c (source_to_dialog_new): nuke - it's identical to source_to_dialog. (dialog_to_source): we only have one auth entry now. fill it in properly. (source_to_dialog): fill in the auth entry properly based on the auth type, and remove auth_entry_notebook references. (auth_optionmenu_activated): remove auth_entry_notebook references. (setup_general_tab): same, and use auth-entry instead of email-entry/dn-entry. (general_tab_check): use auth_principle instead of email/binddn. (add_folder_modify): same. (addressbook_add_server_dialog): put setup_connecting_tab inside the ifdef HAVE_LDAP, and call source_to_dialog instead of source_to_dialog_new. (addressbook_config_edit_source): always call setup_general_tab. * gui/component/addressbook-config.h (AddressbookLDAPScopeType): reorder to match order in option menu (we should really remove BASE altogether.. it's useless for searching.) * gui/component/addressbook-view.c (update_command_state): macroize this, annoying seeing the same 4 lines repeated 15 times. svn path=/trunk/; revision=26445 --- addressbook/gui/component/addressbook-config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addressbook/gui/component/addressbook-config.h') diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h index b5800bc123..9f8259ce49 100644 --- a/addressbook/gui/component/addressbook-config.h +++ b/addressbook/gui/component/addressbook-config.h @@ -34,9 +34,9 @@ typedef enum { } AddressbookLDAPAuthType; typedef enum { + ADDRESSBOOK_LDAP_SCOPE_BASE, ADDRESSBOOK_LDAP_SCOPE_ONELEVEL, ADDRESSBOOK_LDAP_SCOPE_SUBTREE, - ADDRESSBOOK_LDAP_SCOPE_BASE, ADDRESSBOOK_LDAP_SCOPE_LAST } AddressbookLDAPScopeType; -- cgit