# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1192818968 0
# Node ID 5defb0546059c6bf9fbf4cfdd19b56d59ca94bbe
# Parent  58a57a0ca80766180131afdc24bdf1eb869577ba
applied changes from c848ad4c20988b5dac9ac164455d3ba2d7307230
             through 9d35dde0c779cca73548172223ba557f27d61882

diff -r 58a57a0ca807 -r 5defb0546059 libpurple/protocols/myspace/markup.c
--- a/libpurple/protocols/myspace/markup.c	Fri Oct 19 18:30:30 2007 +0000
+++ b/libpurple/protocols/myspace/markup.c	Fri Oct 19 18:36:08 2007 +0000
@@ -400,6 +400,8 @@
 msim_markup_tag_to_html(MsimSession *session, xmlnode *root, gchar **begin, 
 		gchar **end)
 {
+	g_return_if_fail(root != NULL);
+
 	if (g_str_equal(root->name, "f")) {
 		msim_markup_f_to_html(session, root, begin, end);
 	} else if (g_str_equal(root->name, "a")) {
@@ -415,7 +417,7 @@
 	} else {
 		purple_debug_info("msim", "msim_markup_tag_to_html: "
 				"unknown tag name=%s, ignoring", 
-				(root && root->name) ? root->name : "(NULL)");
+				root->name ? root->name : "(NULL)");
 		*begin = g_strdup("");
 		*end = g_strdup("");
 	}