aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/ephy-main.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a66da3605..f836bf271 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-31 Christian Persch <chpe@svn.gnome.org>
+
+ * src/ephy-main.c: (main):
+
+ Make sure to init gthread as first call to glib.
+
2006-12-30 Diego Escalante Urrelo <diegoe@cvs.gnome.org>
* src/ephy-statusbar.c:
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 3ad0b84ed..bd2f2a4f1 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -427,6 +427,10 @@ main (int argc,
textdomain (GETTEXT_PACKAGE);
#endif
+ /* Threads have to be initialised before calling ANY glib function */
+ g_thread_init (NULL);
+ dbus_g_thread_init ();
+
/* check libxml2 API version epiphany was compiled with against the
* version we're running with.
*/