Mercurial > pidgin.yaz

changeset 16958:46985e1ae76a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Try this instead. This calls g_thread_init from main(), before any other glib function is called.
author Sean Egan <seanegan@gmail.com>
date Tue, 08 May 2007 18:22:02 +0000
parents 0cd50792a5f7
children 74957a0aa633
files pidgin/gtkmain.c pidgin/gtksound.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkmain.c	Tue May 08 17:59:56 2007 +0000
+++ b/pidgin/gtkmain.c	Tue May 08 18:22:02 2007 +0000
@@ -474,6 +474,9 @@
 	debug_enabled = FALSE;
 #endif
 
+	/* This is the first Glib function call. Make sure to initialize GThread bfeore then */
+	g_thread_init(NULL);
+	
 #ifdef PURPLE_FATAL_ASSERTS
 	/* Make g_return_... functions fatal. */
 	g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
--- a/pidgin/gtksound.c	Tue May 08 17:59:56 2007 +0000
+++ b/pidgin/gtksound.c	Tue May 08 18:22:02 2007 +0000
@@ -306,8 +306,6 @@
 
 #ifdef USE_GSTREAMER
 	purple_debug_info("sound", "Initializing sound output drivers.\n");
-	if (!g_thread_supported())
-		g_thread_init(NULL);
 	if ((gst_init_failed = !gst_init_check(NULL, NULL, &error))) {
 		purple_notify_error(NULL, _("GStreamer Failure"),
 					_("GStreamer failed to initialize."),