diff options
| -rw-r--r-- | mail/ChangeLog | 3 | ||||
| -rw-r--r-- | mail/main.c | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 95e8d179c6..79947c2ebb 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,8 @@ 2000-06-27 Peter Williams <peterw@curious-george.helixcode.com> + * main.c (main): Don't start threads or enter threads if + there's no threading! Sigh. + * test-thread.c: Don't compile if no threads. * session.c: Work without broken threads. diff --git a/mail/main.c b/mail/main.c index 143277c854..d085fc879f 100644 --- a/mail/main.c +++ b/mail/main.c @@ -66,8 +66,9 @@ main (int argc, char *argv []) bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR); textdomain (PACKAGE); +#ifdef USE_BROKEN_THREADS g_thread_init( NULL ); - +#endif init_corba (&argc, argv); init_bonobo (); gtkhtmllib_init (argc, argv); @@ -79,9 +80,13 @@ main (int argc, char *argv []) component_factory_init (); +#ifdef USE_BROKEN_THREADS GDK_THREADS_ENTER (); +#endif bonobo_main (); +#ifdef USE_BROKEN_THREADS GDK_THREADS_LEAVE (); +#endif return 0; } |