Mercurial > gftp.yaz
changeset 906:2089f064a360
2007-3-26 Brian Masney <masneyb@gftp.org>
* src/gtk/gftp-gtk.c (main) - call gdk_threads_enter() earlier in the
startup. This fixes an issue where gftp can hang on startup.
(from Nick Mainsbridge <beatroot@optushome.com.au>)
| author | masneyb |
|---|---|
| date | Wed, 28 Mar 2007 02:33:02 +0000 |
| parents | c2be64b831d9 |
| children | 77c175a948e8 |
| files | ChangeLog src/gtk/gftp-gtk.c |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Mar 28 02:31:06 2007 +0000 +++ b/ChangeLog Wed Mar 28 02:33:02 2007 +0000 @@ -1,4 +1,8 @@ 2007-3-26 Brian Masney <masneyb@gftp.org> + * src/gtk/gftp-gtk.c (main) - call gdk_threads_enter() earlier in the + startup. This fixes an issue where gftp can hang on startup. + (from Nick Mainsbridge <beatroot@optushome.com.au>) + * src/gtk/view_dialog.c - fixed codepage related issue in the view/edit file feature (from Alexander Orlov <alxorlov@pochta.ru>)
--- a/src/gtk/gftp-gtk.c Wed Mar 28 02:31:06 2007 +0000 +++ b/src/gtk/gftp-gtk.c Wed Mar 28 02:33:02 2007 +0000 @@ -1368,7 +1368,7 @@ #if GTK_MAJOR_VERSION > 1 gdk_threads_init(); #endif - + GDK_THREADS_ENTER (); main_thread_id = pthread_self (); gtk_set_locale (); gtk_init (&argc, &argv); @@ -1408,7 +1408,6 @@ _setup_window1 (); _setup_window2 (argc, argv); - GDK_THREADS_ENTER (); gtk_main (); GDK_THREADS_LEAVE ();