diff options
| author | Chris Toshok <toshok@ximian.com> | 2002-04-19 05:26:48 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2002-04-19 05:26:48 +0800 |
| commit | 9b7cc54d6ff67c83590706ee0b6749a7e1f3ca21 (patch) | |
| tree | 3738f8f1fb02399157515420ff995ad5a428936f /addressbook/gui/component/addressbook.c | |
| parent | 0c7e55e75cc787269ab570588f3873b6279aede1 (diff) | |
| download | gsoc2013-evolution-9b7cc54d6ff67c83590706ee0b6749a7e1f3ca21.tar gsoc2013-evolution-9b7cc54d6ff67c83590706ee0b6749a7e1f3ca21.tar.gz gsoc2013-evolution-9b7cc54d6ff67c83590706ee0b6749a7e1f3ca21.tar.bz2 gsoc2013-evolution-9b7cc54d6ff67c83590706ee0b6749a7e1f3ca21.tar.lz gsoc2013-evolution-9b7cc54d6ff67c83590706ee0b6749a7e1f3ca21.tar.xz gsoc2013-evolution-9b7cc54d6ff67c83590706ee0b6749a7e1f3ca21.tar.zst gsoc2013-evolution-9b7cc54d6ff67c83590706ee0b6749a7e1f3ca21.zip | |
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
Diffstat (limited to 'addressbook/gui/component/addressbook.c')
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 42f05f8217..99ba3b9521 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -32,7 +32,7 @@ #include "evolution-activity-client.h" #include "e-contact-editor.h" #include "e-contact-save-as.h" -#include "addressbook-config.h" +#include "ldap-config.h" #include "addressbook.h" #include "addressbook-component.h" #include "addressbook/gui/search/e-addressbook-search-dialog.h" @@ -519,7 +519,7 @@ book_open_cb (EBook *book, EBookStatus status, gpointer closure) source = addressbook_storage_get_source_by_uri (view->uri); - if (source && source->type == ADDRESSBOOK_SOURCE_LDAP) { + if (source) { #if HAVE_LDAP label = gtk_label_new ( _("We were unable to open this addressbook. This either\n" @@ -629,7 +629,6 @@ load_uri_cb (EBook *book, EBookStatus status, gpointer closure) /* check if the addressbook needs authentication */ if (source && - source->type == ADDRESSBOOK_SOURCE_LDAP && source->auth != ADDRESSBOOK_LDAP_AUTH_NONE) { const char *password; char *pass_dup = NULL; |