From 6db3f4828107c4aa9e648a8c7f8b71b0825593b2 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Tue, 10 Jul 2001 04:49:49 +0000 Subject: Set bf->priv->file_db before calling do_create. 2001-07-10 Christopher James Lahey * backend/pas/pas-backend-file.c (pas_backend_file_load_uri): Set bf->priv->file_db before calling do_create. 2001-07-06 Christopher James Lahey * gui/component/addressbook-component.c (factory_fn): Fixed order of arguments to evolution_shell_component_new. svn path=/trunk/; revision=10949 --- addressbook/backend/pas/pas-backend-file.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'addressbook/backend') diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c index 4f0b54dc61..56ce7dcd3d 100644 --- a/addressbook/backend/pas/pas-backend-file.c +++ b/addressbook/backend/pas/pas-backend-file.c @@ -1476,6 +1476,8 @@ pas_backend_file_load_uri (PASBackend *backend, db_error = db->open (db, filename, NULL, DB_HASH, 0, 0666); } + bf->priv->file_db = db; + if (db_error == 0) { writable = TRUE; } else { @@ -1507,12 +1509,13 @@ pas_backend_file_load_uri (PASBackend *backend, g_free (filename); + if (db_error != 0) { + bf->priv->file_db = NULL; return FALSE; } bf->priv->writable = writable; - bf->priv->file_db = db; if (pas_backend_file_maybe_upgrade_db (bf)) bf->priv->loaded = TRUE; -- cgit v1.2.3