diff options
Diffstat (limited to 'wombat')
| -rw-r--r-- | wombat/ChangeLog | 5 | ||||
| -rw-r--r-- | wombat/wombat.c | 22 |
2 files changed, 23 insertions, 4 deletions
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 <trow@ximian.com> + + * wombat.c (main): If we can't initialize a service on startup, + tell us which one before terminating. + 2001-02-27 Federico Mena Quintero <federico@ximian.com> * 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)); |