diff options
| -rw-r--r-- | addressbook/ChangeLog | 10 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-backend-file.c | 5 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-component.c | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 026d3b6fb8..60307ed65c 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,13 @@ +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. + 2001-07-08 Jon Trowbridge <trow@ximian.com> * gui/component/select-names/e-select-names-text-model.c 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; diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index ea67fdf6e7..667904e4d1 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -334,8 +334,8 @@ factory_fn (BonoboGenericFactory *factory, shell_component = evolution_shell_component_new (folder_types, NULL, create_view, create_folder, remove_folder, xfer_folder, - get_dnd_selection, NULL, + get_dnd_selection, NULL); destination_interface = evolution_shell_component_dnd_destination_folder_new (destination_folder_handle_motion, |