# HG changeset patch
# User maiku@pidgin.im
# Date 1251502028 0
# Node ID 67e93a042bf9394bd8d722d222da940aa1b660d4
# Parent  3a35ff11d51b240c701bb34e877e2597ad07a66e# Parent  5901b1dd8d072f1c720748bd4c7f79c2197f9d7d
merge of '38ebec4433858a0ad3e429387c23ab0f1d8c0f12'
     and 'c0a4c2650c0117a4b956199f56d5b990e0c3fb0d'

diff -r 3a35ff11d51b -r 67e93a042bf9 libpurple/util.c
--- a/libpurple/util.c	Fri Aug 28 23:14:30 2009 +0000
+++ b/libpurple/util.c	Fri Aug 28 23:27:08 2009 +0000
@@ -3129,11 +3129,8 @@
 	const char *ret = NULL;
 	static char buf[BUF_LEN];
 
-	/* g_utf8_normalize() for glib ver < 2.15.0 causes a crash when an invalid utf8 string is passed to it
-	   (http://bugzilla.gnome.org/show_bug.cgi?id=501997).
-	   Returning NULL when str is NULL, should prevent a few crashes, see #10115 */
-	if(!str)
-		return NULL;
+	/* This should prevent a crash if purple_normalize gets called with NULL str, see #10115 */
+	g_return_val_if_fail(str != NULL, "");
 
 	if (account != NULL)
 	{