Mercurial > pidgin

comparison libpurple/protocols/jabber/buddy.c @ 22780: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 3225c99785b8
children cc8903c59d6b
comparison
equal deleted inserted replaced
22754:8c3f6126759c 22780:46ab2e2171b8
153 jbr->capabilities = JABBER_CAP_XHTML; 153 jbr->capabilities = JABBER_CAP_XHTML;
154 jb->resources = g_list_append(jb->resources, jbr); 154 jb->resources = g_list_append(jb->resources, jbr);
155 } 155 }
156 jbr->priority = priority; 156 jbr->priority = priority;
157 jbr->state = state; 157 jbr->state = state;
158 if(jbr->status) 158 g_free(jbr->status);
159 g_free(jbr->status); 159 jbr->status = status != NULL ? g_markup_escape_text(status, -1) : NULL;
160 if (status)
161 jbr->status = g_markup_escape_text(status, -1);
162 else
163 jbr->status = NULL;
164 160
165 return jbr; 161 return jbr;
166 } 162 }
167 163
168 void jabber_buddy_resource_free(JabberBuddyResource *jbr) 164 void jabber_buddy_resource_free(JabberBuddyResource *jbr)