aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@ximian.com>2001-07-10 12:49:49 +0800
committerChris Lahey <clahey@src.gnome.org>2001-07-10 12:49:49 +0800
commit6db3f4828107c4aa9e648a8c7f8b71b0825593b2 (patch)
tree2e5acc512280cde555707fb5f8645760dbdedc51 /addressbook/backend
parentc417a47019c45c3d556700ecb5e5ffb225fc0eb1 (diff)
downloadgsoc2013-evolution-6db3f4828107c4aa9e648a8c7f8b71b0825593b2.tar.gz
gsoc2013-evolution-6db3f4828107c4aa9e648a8c7f8b71b0825593b2.tar.zst
gsoc2013-evolution-6db3f4828107c4aa9e648a8c7f8b71b0825593b2.zip
Set bf->priv->file_db before calling do_create.
2001-07-10 Christopher James Lahey <clahey@ximian.com> * 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 <clahey@ximian.com> * gui/component/addressbook-component.c (factory_fn): Fixed order of arguments to evolution_shell_component_new. svn path=/trunk/; revision=10949
Diffstat (limited to 'addressbook/backend')
-rw-r--r--addressbook/backend/pas/pas-backend-file.c5
1 files changed, 4 insertions, 1 deletions
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;