# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1180659019 0
# Node ID 95203f9325a34953f3832c16dd7295ca05fec731
# Parent  42444b7071d3ce06f6fa6628083de747535f0499# Parent  bfdc5995d54af49b9eac8d8e7ac0a415916f6141
merge of '65a2625990bbafe0f7d435e23be894ec9a7dc189'
     and '9000e0be743fc6ffde1eb0eff1f861bbdaec9a06'

diff -r bfdc5995d54a -r 95203f9325a3 libpurple/protocols/msn/sync.c
--- a/libpurple/protocols/msn/sync.c	Fri Jun 01 00:49:26 2007 +0000
+++ b/libpurple/protocols/msn/sync.c	Fri Jun 01 00:50:19 2007 +0000
@@ -195,6 +195,8 @@
 
 	user = sync->last_user;
 
+	g_return_if_fail(user != NULL);
+
 	type     = cmd->params[0];
 	value    = cmd->params[1];
 
diff -r bfdc5995d54a -r 95203f9325a3 pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Fri Jun 01 00:49:26 2007 +0000
+++ b/pidgin/gtkmain.c	Fri Jun 01 00:50:19 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);