Mercurial > pidgin.yaz

changeset 22756:46ab2e2171b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify
author Mark Doliner <mark@kingant.net>
date Tue, 29 Apr 2008 01:33:48 +0000
parents 8c3f6126759c
children 2404b13940e9
files libpurple/protocols/jabber/buddy.c
diffstat 1 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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;
 }