# HG changeset patch
# User masneyb
# Date 1175049182 0
# Node ID 2089f064a360d40ccc4bae3af702d11a3114cc83
# Parent  c2be64b831d92e89abccab798eee07360398ddf7
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>)

diff -r c2be64b831d9 -r 2089f064a360 ChangeLog
--- 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>)
 
diff -r c2be64b831d9 -r 2089f064a360 src/gtk/gftp-gtk.c
--- 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 ();