From ebd4a9fa7f3bd6d94e85cba93e4190a7bbb07f92 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Fri, 10 Jan 2003 04:02:25 +0000 Subject: try to load the uri again if it failed previously. (book_open_cb): set 2003-01-09 Chris Toshok * gui/component/addressbook.c (control_activate_cb): try to load the uri again if it failed previously. (book_open_cb): set failed_to_load based on the response. (set_prop): initialize failed_to_load to FALSE before we kick off the first load. * backend/pas/pas-book-factory.c (pas_book_factory_process_request): if the load_uri fails, remove it from the hashtable and free it, so we'll try to load it again from scratch the next time it's requested instead of serving up a backend that doesn't function. * backend/pas/pas-backend.c (pas_backend_get_uri): we need to be able to get the uri from backends that aren't loaded (so we can remove them from the hashtable.) svn path=/trunk/; revision=19392 --- addressbook/backend/pas/pas-backend.c | 1 - addressbook/backend/pas/pas-book-factory.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'addressbook/backend') diff --git a/addressbook/backend/pas/pas-backend.c b/addressbook/backend/pas/pas-backend.c index c8acad3c93..b47afd8d30 100644 --- a/addressbook/backend/pas/pas-backend.c +++ b/addressbook/backend/pas/pas-backend.c @@ -58,7 +58,6 @@ pas_backend_get_uri (PASBackend *backend) { g_return_val_if_fail (backend != NULL, NULL); g_return_val_if_fail (PAS_IS_BACKEND (backend), NULL); - g_return_val_if_fail (backend->priv->loaded, NULL); g_assert (PAS_BACKEND_GET_CLASS (backend)->get_uri != NULL); diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c index 5a258edcfe..460e83e73a 100644 --- a/addressbook/backend/pas/pas-book-factory.c +++ b/addressbook/backend/pas/pas-book-factory.c @@ -302,6 +302,8 @@ pas_book_factory_process_request (PASBookFactory *factory, CORBA_exception_free (&ev); + backend_last_client_gone_cb (backend, factory); + goto out; } -- cgit v1.2.3