fix memory leaks.

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

	* backend/pas/pas-backend-ldap.c (get_ldap_library_info): fix
	memory leaks.

	* gui/component/GNOME_Evolution_Addressbook.oaf.in: remove the
	Addressbook_ConfigControl stuff to LDAP_ConfigControl.

	* gui/component/Makefile.am (evolution_addressbook_SOURCES):
	remove addressbook-config.* and add ldap-config.*
	(glade_DATA): same.
	(evolution_addressbook_LDADD): add LDAP_LIBS.

	* gui/component/addressbook-component.c (owner_set_cb):
	addressbook_config_register_factory =>
	ldap_config_register_factory.

	* gui/component/addressbook.c (book_open_cb): remove source->type
	check - they're always LDAP.
	(load_uri_cb): same.

	* gui/component/addressbook-storage.c (ldap_unparse_ssl): new
	function.
	(ldap_parse_ssl): new function.
	(addressbook_storage_init_source_uri): use a more flexible scheme
	to build up the uri's, and add in the ssl parameter.
	(load_source_data): fill in source->ssl, and remove source->type
	assignment.
	(addressbook_source_copy): copy source->ssl, and remove
	source->type copy.
	(create_ldap_folder): addressbook_create_new_source =>
	ldap_config_create_new_source.

	* gui/component/addressbook-storage.h: remove
	AddressbookSourceType (it was always LDAP), and add
	AddressbookLDAPSSLType.

svn path=/trunk/; revision=16524

1 files changed, 9 insertions, 8 deletions

diff --git a/addressbook/gui/component/addressbook-storage.h b/addressbook/gui/component/addressbook-storage.h
index 6d0c6252cf..edaa5cfb83 100644
--- a/addressbook/gui/component/addressbook-storage.h
+++ b/addressbook/gui/component/addressbook-storage.h
@@ -27,12 +27,6 @@
 #include "evolution-storage.h"
 
 typedef enum {
-	ADDRESSBOOK_SOURCE_LDAP,
-	ADDRESSBOOK_SOURCE_FILE,
-	ADDRESSBOOK_SOURCE_LAST
-} AddressbookSourceType;
-
-typedef enum {
 	ADDRESSBOOK_LDAP_AUTH_NONE,
 	ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL,
 	ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN,
@@ -45,8 +39,13 @@ typedef enum {
 	ADDRESSBOOK_LDAP_SCOPE_LAST
 } AddressbookLDAPScopeType;
 
+typedef enum {
+	ADDRESSBOOK_LDAP_SSL_NEVER,
+	ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE,
+	ADDRESSBOOK_LDAP_SSL_ALWAYS
+} AddressbookLDAPSSLType;
+
 typedef struct {
-	AddressbookSourceType type;
 	char *name;
 	char *description;
 	char *host;
@@ -54,11 +53,13 @@ typedef struct {
 	char *rootdn;
 	AddressbookLDAPScopeType scope;
 	AddressbookLDAPAuthType auth;
+	AddressbookLDAPSSLType ssl;
 	char *email_addr;                   /* used in AUTH_SIMPLE_EMAIL */
 	char *binddn;                       /* used in AUTH_SIMPLE_BINDDN */
 	gboolean remember_passwd;
-	char *uri; /* filled in from the above */
 	int limit;
+
+	char *uri; /* filled in from the above */
 } AddressbookSource;
 
 void addressbook_storage_setup (EvolutionShellComponent *shell_component,