diff options
| -rw-r--r-- | shell/ChangeLog | 7 | ||||
| -rw-r--r-- | shell/main.c | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index e8a733ec1c..d41fbabfe1 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2006-02-21 Tor Lillqvist <tml@novell.com> + + * main.c (main): On Win32, finally call link_shutdown() (from + ORBit2/linc2), otherwise we hang with the link_io_thread still + running (blocked in g_poll()). Sigh, the linc2 code is a + mystery. Why this is necessary I have no idea. + 2006-02-07 Andre Klapper <a9016009@gmx.de> * e-shell-window-commands.c: changing year from 2005 to 2006. diff --git a/shell/main.c b/shell/main.c index c29e25c4bd..ee4d8cc728 100644 --- a/shell/main.c +++ b/shell/main.c @@ -463,6 +463,9 @@ setup_segv_redirect (void) int main (int argc, char **argv) { +#ifdef G_OS_WIN32 + extern void link_shutdown (void); +#endif struct poptOption options[] = { { "component", 'c', POPT_ARG_STRING, &default_component_id, 0, N_("Start Evolution activating the specified component"), NULL }, @@ -606,6 +609,8 @@ main (int argc, char **argv) g_object_unref (program); gnome_sound_shutdown (); e_cursors_shutdown (); - +#ifdef G_OS_WIN32 + link_shutdown (); +#endif return 0; } |