im.pidgin.pidgin.2.2.2: 406fe93bfe587069d37aed16cb51775d032b7659

[lschiere at pidgin.im]

-----------------------------------------------------------------
Revision: 406fe93bfe587069d37aed16cb51775d032b7659
Ancestor: 5e955b9c7baca4634c7900fe07511bbf4102e26a
Author: lschiere at pidgin.im
Date: 2007-10-19T18:36:08
Branch: im.pidgin.pidgin.2.2.2

Modified files:
        libpurple/protocols/myspace/markup.c

ChangeLog: 

applied changes from c848ad4c20988b5dac9ac164455d3ba2d7307230
             through 9d35dde0c779cca73548172223ba557f27d61882

-------------- next part --------------
============================================================
--- libpurple/protocols/myspace/markup.c	601eba537d9430d1b73ac8effa465391d866f2b3
+++ libpurple/protocols/myspace/markup.c	8af25a07b95fcd5858e6a25633a4fdaad8bc6a8e
@@ -400,6 +400,8 @@ msim_markup_tag_to_html(MsimSession *ses
 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 @@ msim_markup_tag_to_html(MsimSession *ses
 	} 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("");
 	}