Mercurial > pidgin.yaz
changeset 20335:5defb0546059
applied changes from c848ad4c20988b5dac9ac164455d3ba2d7307230
through 9d35dde0c779cca73548172223ba557f27d61882
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Fri, 19 Oct 2007 18:36:08 +0000 |
| parents | 58a57a0ca807 |
| children | b93e7be3847b |
| files | libpurple/protocols/myspace/markup.c |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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(""); }