From 57de6972c845dbae49717a4520aeed75f88f0078 Mon Sep 17 00:00:00 2001 From: Jon Trowbridge Date: Fri, 16 Mar 2001 08:16:29 +0000 Subject: Added addressbook querying and "cardification" functions, which are turned 2001-03-15 Jon Trowbridge * gui/component/e-address-widget.c: Added addressbook querying and "cardification" functions, which are turned off by default for now because of addressbook bugs. Added a popup menu option to turn queries on, so that others can enjoy the thrill of massive flaming death. * gui/component/addressbook-factory.c (main): Made warnings always be fatal. * backend/pas/pas-book-view.c: Added some debugging spew. * backend/pas/pas-backend-file.c (pas_backend_file_search): Added a little experimental code to try to make file searches scale better. #if 0/#endif-ed out for now. * contact-editor/e-contact-quick-add.c: #included e-book-util.h. * backend/ebook/e-card.c (e_card_name_match_string): Added. Looser name-matching function. (e_card_email_match_string): Added. Loose e-mail matching. * backend/ebook/e-book-view-listener.c (e_book_view_listener_check_queue): Added code to cause us to abort rather than get trapped in a 100%-CPU-consuming loop in certain situations. Now we just need to figure out how to avoid these situations altogether. * backend/ebook/e-book-util.c: Added. Now contains the simple query stuff and the open local addressbook functions. * backend/ebook/e-book.c: Moved simple query stuff and open local addressbook functions into e-book-util.c. 2001-03-15 Jon Trowbridge * wombat.c (main): If we can't initialize a service on startup, tell us which one before terminating. svn path=/trunk/; revision=8754 --- wombat/ChangeLog | 5 +++++ wombat/wombat.c | 22 ++++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) (limited to 'wombat') diff --git a/wombat/ChangeLog b/wombat/ChangeLog index e32b3e0da6..bf205db52a 100644 --- a/wombat/ChangeLog +++ b/wombat/ChangeLog @@ -1,3 +1,8 @@ +2001-03-15 Jon Trowbridge + + * wombat.c (main): If we can't initialize a service on startup, + tell us which one before terminating. + 2001-02-27 Federico Mena Quintero * wombat.c (init_corba): Use VERSION and the Wombat description diff --git a/wombat/wombat.c b/wombat/wombat.c index e93c0838fe..29bd87b217 100644 --- a/wombat/wombat.c +++ b/wombat/wombat.c @@ -183,9 +183,13 @@ init_bonobo (int *argc, char **argv) int main (int argc, char **argv) { + gboolean did_pas=FALSE, did_pcs=FALSE, did_config=FALSE; + bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR); textdomain (PACKAGE); + g_message ("Starting wombat"); + init_bonobo (&argc, argv); setup_vfs (argc, argv); @@ -193,10 +197,20 @@ main (int argc, char **argv) G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);*/ - if (!(setup_pas (argc, argv) - && setup_pcs (argc, argv) - && setup_config (argc, argv))) { - g_message ("main(): could not initialize all of the Wombat services; terminating"); + if (!( (did_pas = setup_pas (argc, argv)) + && (did_pcs = setup_pcs (argc, argv)) + && (did_config = setup_config (argc, argv)))) { + + const gchar *failed = NULL; + + if (!did_pas) + failed = "PAS"; + else if (!did_pcs) + failed = "PCS"; + else if (!did_config) + failed = "Config"; + + g_message ("main(): could not initialize Wombat service \"%s\"; terminating", failed); if (pas_book_factory) { bonobo_object_unref (BONOBO_OBJECT (pas_book_factory)); -- cgit v1.2.3