changeset 17545:b23999491c64

merge of '8ae64558f2dc02cbc051dda2e2e6e4270b03f7f3' and 'c2025c2fd1fcbae580c830d05a4945eaa5192bd9'
author Sean Egan <seanegan@gmail.com>
date Thu, 31 May 2007 18:28:09 +0000
parents 0dbb403c9016 (current diff) 57e81bfeab3d (diff)
children 55ded28f6640
files pidgin/pixmaps/emotes/default/22/theme pidgin/pixmaps/emotes/none/theme
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkmain.c	Thu May 31 03:02:13 2007 +0000
+++ b/pidgin/gtkmain.c	Thu May 31 18:28:09 2007 +0000
@@ -473,6 +473,9 @@
 #else
 	debug_enabled = FALSE;
 #endif
+
+	/* This is the first Glib function call. Make sure to initialize GThread bfeore then */
+	g_thread_init(NULL);
 	
 #ifdef ENABLE_NLS
 	bindtextdomain(PACKAGE, LOCALEDIR);