From edb8c5850a180be4d015a90da44cf2581fb27ba9 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Mon, 1 May 2000 20:44:00 +0000 Subject: Made uri slightly better managed. 2000-05-01 Christopher James Lahey * 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 --- addressbook/backend/pas/pas-backend-file.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'addressbook/backend/pas/pas-backend-file.c') diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c index e2ca9a7348..11b5abb670 100644 --- a/addressbook/backend/pas/pas-backend-file.c +++ b/addressbook/backend/pas/pas-backend-file.c @@ -944,7 +944,8 @@ pas_backend_file_load_uri (PASBackend *backend, if (pas_backend_file_maybe_upgrade_db (bf)) bf->priv->loaded = TRUE; /* XXX what if we fail to upgrade it? */ - + + g_free(bf->priv->uri); bf->priv->uri = g_strdup (uri); } else { GList *l; @@ -1096,10 +1097,7 @@ pas_backend_file_destroy (GtkObject *object) bf = PAS_BACKEND_FILE (object); - if (bf->priv->uri) { - g_free (bf->priv->uri); - bf->priv->uri = NULL; - } + g_free (bf->priv->uri); GTK_OBJECT_CLASS (pas_backend_file_parent_class)->destroy (object); } @@ -1132,6 +1130,7 @@ pas_backend_file_init (PASBackendFile *backend) priv->loaded = FALSE; priv->clients = NULL; priv->book_views = NULL; + priv->uri = NULL; backend->priv = priv; } -- cgit v1.2.3