Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/adhoccommands.c @ 20685:02df6998b466
propagate from branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head 4ad1081695d083df424898e6e7091f731b401265)
to branch 'im.pidgin.pidgin' (head d33243e8f5347776c81f81a0e4ba3a76ae5505a5)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 28 Sep 2007 16:34:43 +0000 |
| parents | 5103485b4b26 |
| children | bde477ec6a71 d1da36099088 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/adhoccommands.c Fri Sep 28 16:32:28 2007 +0000 +++ b/libpurple/protocols/jabber/adhoccommands.c Fri Sep 28 16:34:43 2007 +0000 @@ -151,8 +151,11 @@ /* display result */ xmlnode *note = xmlnode_get_child(command,"note"); - if(note) - purple_notify_info(NULL, xmlnode_get_attrib(packet, "from"), xmlnode_get_data(note), NULL); + if(note) { + char *data = xmlnode_get_data(note); + purple_notify_info(NULL, xmlnode_get_attrib(packet, "from"), data, NULL); + g_free(data); + } if(xdata) jabber_x_data_request(js, xdata, (jabber_x_data_cb)do_adhoc_ignoreme, NULL);