fill in source->ssl. (addressbook_source_dialog_set_source): set up

2002-04-18  Chris Toshok  <toshok@ximian.com>

	* gui/component/ldap-config.c (addressbook_dialog_get_source):
	fill in source->ssl.
	(addressbook_source_dialog_set_source): set up auth/scope/ssl
	option menus properly.

	* gui/component/addressbook-storage.c
	(addressbook_storage_init_source_uri): always include the
	limit/ssl in the uri so we don't need to rely on defaults
	everywhere.
	(ldap_source_foreach): store the ssl option.

	* gui/component/addressbook-storage.h: reorder SSLType to match
	the UI.

	* backend/pas/pas-backend-ldap.c: (struct _PASBackendLDAPPrivate)
	add field for ldap_timeout.
	(pas_backend_ldap_connect): reorder things a bit - we need to
	start tls before the root dse query, if we can.
	(pas_backend_ldap_load_uri): track the way ssl parameters are
	given in the uri, and parse out the timeout.

	* gui/component/ldap-config.c (port_changed_func): use the
	symbolic SSL name instead of an integer constant.

svn path=/trunk/; revision=16529

1 files changed, 2 insertions, 2 deletions

diff --git a/addressbook/gui/component/addressbook-storage.h b/addressbook/gui/component/addressbook-storage.h
index edaa5cfb83..541d8096f7 100644
--- a/addressbook/gui/component/addressbook-storage.h
+++ b/addressbook/gui/component/addressbook-storage.h
@@ -40,9 +40,9 @@ typedef enum {
 } AddressbookLDAPScopeType;
 
 typedef enum {
-	ADDRESSBOOK_LDAP_SSL_NEVER,
+	ADDRESSBOOK_LDAP_SSL_ALWAYS,
 	ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE,
-	ADDRESSBOOK_LDAP_SSL_ALWAYS
+	ADDRESSBOOK_LDAP_SSL_NEVER
 } AddressbookLDAPSSLType;
 
 typedef struct {