diff options
| -rw-r--r-- | wombat/ChangeLog | 5 | ||||
| -rw-r--r-- | wombat/wombat.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/wombat/ChangeLog b/wombat/ChangeLog index ecedb46a35..a76545aa3a 100644 --- a/wombat/ChangeLog +++ b/wombat/ChangeLog @@ -1,3 +1,8 @@ +2001-10-22 Ettore Perazzoli <ettore@ximian.com> + + * wombat.c (main): Register the public ConfigDatabase interface + last to work around an OAF race condition. + 2001-10-11 Chris Toshok <toshok@ximian.com> * Makefile.am (wombat_SOURCES): add wombat-private-moniker.[ch]. diff --git a/wombat/wombat.c b/wombat/wombat.c index 65f0b6f479..f7fbc9227c 100644 --- a/wombat/wombat.c +++ b/wombat/wombat.c @@ -239,8 +239,10 @@ main (int argc, char **argv) if (!( (did_pas = setup_pas (argc, argv)) && (did_pcs = setup_pcs (argc, argv)) - && (did_config = setup_config (argc, argv)) - && (did_private = setup_private (argc, argv)))) { + && (did_private = setup_private (argc, argv)) + /* WARNING: Do not change the order here. `setup_config()' must + come last, to work around an OAF race condition. */ + && (did_config = setup_config (argc, argv)))) { const gchar *failed = NULL; |