# HG changeset patch # User Mark Doliner # Date 1209432828 0 # Node ID 46ab2e2171b814b13dc09ffc78252bb23c0c1ab7 # Parent 8c3f6126759c9e65c0034fed02515d043672e656 Simplify diff -r 8c3f6126759c -r 46ab2e2171b8 libpurple/protocols/jabber/buddy.c --- a/libpurple/protocols/jabber/buddy.c Mon Apr 28 06:40:48 2008 +0000 +++ b/libpurple/protocols/jabber/buddy.c Tue Apr 29 01:33:48 2008 +0000 @@ -155,12 +155,8 @@ } jbr->priority = priority; jbr->state = state; - if(jbr->status) - g_free(jbr->status); - if (status) - jbr->status = g_markup_escape_text(status, -1); - else - jbr->status = NULL; + g_free(jbr->status); + jbr->status = status != NULL ? g_markup_escape_text(status, -1) : NULL; return jbr; }