go slow and clear the map if the last uri and the current uri do not match

2001-12-18  JP Rosevear  <jpr@ximian.com>

	* conduit/address-conduit.c (check_for_slow_setting): go slow and
	clear the map if the last uri and the current uri do not match
	(post_sync): save the last uri

	* conduits/address-conduit-config.h: handle a last uri config
	option

2001-12-18  Chris Toshok  <toshok@ximian.com>

	* gui/component/addressbook.c (addressbook_default_book_open):
	change this to match its e-book counterpart, and only failover to
	the local addressbook if the protocol wasn't supported.  that way
	errors like "failure to connect" are still reported to the user.

	* backend/ebook/e-book-util.h: add prototypes for
	e_book_load_default_book and e_book_get_config_database.

	* backend/ebook/e-book-util.c (e_book_default_book_open): new
	function, basically cut and paste addressbook_default_book_open
	from addressbook.c here.
	(e_book_load_default_book): cut and past
	addressbook_load_default_book here, pretty much, except leave off
	the auth stuff.
	(e_book_get_config_database): new function, returns the
	Bonobo_ConfigDatabase for e_book_load_default_book to use.

	* conduit/address-conduit.c (start_addressbook_server): use
	e_book_load_default_book here.

svn path=/trunk/; revision=15178

2 files changed, 84 insertions, 0 deletions

diff --git a/addressbook/backend/ebook/e-book-util.c b/addressbook/backend/ebook/e-book-util.c
index f141deb791..04f8a88131 100644
--- a/addressbook/backend/ebook/e-book-util.c
+++ b/addressbook/backend/ebook/e-book-util.c
@@ -33,6 +33,17 @@
 #include <libgnome/gnome-util.h>
 #include "e-card-compare.h"
 
+Bonobo_ConfigDatabase
+e_book_get_config_database (CORBA_Environment *ev)
+{
+	static Bonobo_ConfigDatabase config_db;
+
+	if (config_db == NULL)
+		config_db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", ev);
+
+	return config_db;
+}
+       
 gboolean
 e_book_load_local_address_book (EBook *book, EBookCallback open_response, gpointer closure)
 {
@@ -120,6 +131,69 @@ e_book_use_local_address_book (EBookCommonCallback cb, gpointer closure)
 	}
 }
 
+typedef struct {
+	gpointer closure;
+	EBookCallback open_response;
+} DefaultBookClosure;
+
+static void
+e_book_default_book_open (EBook *book, EBookStatus status, gpointer closure)
+{
+	DefaultBookClosure *default_book_closure = closure;
+	gpointer user_closure = default_book_closure->closure;
+	EBookCallback user_response = default_book_closure->open_response;
+
+	g_free (default_book_closure);
+
+	/* special case the protocol not supported error, since we
+	   really only want to failover to the local book in the case
+	   where there's no installed backend for that protocol.  all
+	   other errors (failure to connect, etc.) should get reported
+	   to the caller as normal. */
+	if (status == E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED) {
+		e_book_load_local_address_book (book, user_response, user_closure);
+	}
+	else {
+		user_response (book, status, user_closure);
+	}
+}
+
+gboolean
+e_book_load_default_book (EBook *book, EBookCallback open_response, gpointer closure)
+{
+	char *val;
+	gboolean rv;
+	CORBA_Environment ev;
+	Bonobo_ConfigDatabase config_db;
+
+	g_return_val_if_fail (book != NULL,          FALSE);
+	g_return_val_if_fail (E_IS_BOOK (book),      FALSE);
+	g_return_val_if_fail (open_response != NULL, FALSE);
+
+	CORBA_exception_init (&ev);
+	config_db = e_book_get_config_database (&ev);
+	val = bonobo_config_get_string (config_db, "/Addressbook/default_book_uri", &ev);
+	CORBA_exception_free (&ev);
+
+	if (val) {
+		DefaultBookClosure *default_book_closure = g_new (DefaultBookClosure, 1);
+		default_book_closure->closure = closure;
+		default_book_closure->open_response = open_response;
+		rv = e_book_load_uri (book, val,
+				      e_book_default_book_open, default_book_closure);
+		g_free (val);
+	}
+	else {
+		rv = e_book_load_local_address_book (book, open_response, closure);
+	}
+
+	if (!rv) {
+		g_warning ("Couldn't load default addressbook");
+	}
+
+	return rv;
+}
+
 /*
  *
  * Simple Query Stuff
diff --git a/addressbook/backend/ebook/e-book-util.h b/addressbook/backend/ebook/e-book-util.h
index 2fad0d9e9c..39e32e633d 100644
--- a/addressbook/backend/ebook/e-book-util.h
+++ b/addressbook/backend/ebook/e-book-util.h
@@ -29,6 +29,9 @@
 
 #include <libgnome/gnome-defs.h>
 #include "e-book.h"
+#include <bonobo-conf/bonobo-config-database.h>
+#include <bonobo/bonobo-object.h>
+#include <bonobo/bonobo-moniker-util.h>
 
 BEGIN_GNOME_DECLS
 
@@ -43,6 +46,13 @@ gboolean e_book_load_local_address_book (EBook *book,
 
 void     e_book_use_local_address_book  (EBookCommonCallback cb, gpointer closure);
 
+gboolean e_book_load_default_book	(EBook *book,
+					 EBookCallback open_response,
+					 gpointer closure);
+
+/* Bonoboconf database interface. */
+Bonobo_ConfigDatabase e_book_get_config_database (CORBA_Environment *ev);
+
 /* Simple Query Interface. */
 
 guint     e_book_simple_query             (EBook                    *book,