diff options
| author | Christopher James Lahey <clahey@helixcode.com> | 2000-05-02 04:44:00 +0800 |
|---|---|---|
| committer | Chris Lahey <clahey@src.gnome.org> | 2000-05-02 04:44:00 +0800 |
| commit | edb8c5850a180be4d015a90da44cf2581fb27ba9 (patch) | |
| tree | 98f7615cf7be9a6b5770a371e8fe4e7a97c2b821 /addressbook/backend/pas/pas-backend-ldap.c | |
| parent | ba2128204f596f12092f6a0ef9da4e51a5dafde5 (diff) | |
| download | gsoc2013-evolution-edb8c5850a180be4d015a90da44cf2581fb27ba9.tar gsoc2013-evolution-edb8c5850a180be4d015a90da44cf2581fb27ba9.tar.gz gsoc2013-evolution-edb8c5850a180be4d015a90da44cf2581fb27ba9.tar.bz2 gsoc2013-evolution-edb8c5850a180be4d015a90da44cf2581fb27ba9.tar.lz gsoc2013-evolution-edb8c5850a180be4d015a90da44cf2581fb27ba9.tar.xz gsoc2013-evolution-edb8c5850a180be4d015a90da44cf2581fb27ba9.tar.zst gsoc2013-evolution-edb8c5850a180be4d015a90da44cf2581fb27ba9.zip | |
Made uri slightly better managed.
2000-05-01 Christopher James Lahey <clahey@helixcode.com>
* backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c:
Made uri slightly better managed.
* backend/pas/pas-book-factory.c
(pas_book_factory_process_request): Remove this
CORBA_Object_release that causes things not to work. This is just
a temporary fix until we figure out what's actually wrong.
* backend/pas/pas-book.c: Fixed a copy and paste error in a warning.
svn path=/trunk/; revision=2718
Diffstat (limited to 'addressbook/backend/pas/pas-backend-ldap.c')
| -rw-r--r-- | addressbook/backend/pas/pas-backend-ldap.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c index 041d7cea4f..e40f6cb922 100644 --- a/addressbook/backend/pas/pas-backend-ldap.c +++ b/addressbook/backend/pas/pas-backend-ldap.c @@ -885,6 +885,7 @@ pas_backend_ldap_load_uri (PASBackend *backend, ldap_error = ldap_url_parse ((char*)uri, &lud); if (ldap_error == LDAP_SUCCESS) { + g_free(bl->priv->uri); bl->priv->uri = g_strdup (uri); bl->priv->ldap_host = g_strdup(lud->lud_host); bl->priv->ldap_port = lud->lud_port; @@ -1040,10 +1041,7 @@ pas_backend_ldap_destroy (GtkObject *object) bl = PAS_BACKEND_LDAP (object); - if (bl->priv->uri) { - g_free (bl->priv->uri); - bl->priv->uri = NULL; - } + g_free (bl->priv->uri); GTK_OBJECT_CLASS (pas_backend_ldap_parent_class)->destroy (object); } @@ -1072,9 +1070,10 @@ pas_backend_ldap_init (PASBackendLDAP *backend) { PASBackendLDAPPrivate *priv; - priv = g_new0 (PASBackendLDAPPrivate, 1); - priv->connected = FALSE; - priv->clients = NULL; + priv = g_new0 (PASBackendLDAPPrivate, 1); + priv->connected = FALSE; + priv->clients = NULL; + priv->uri = NULL; backend->priv = priv; } |