Mercurial > pidgin
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 20258:509ca8ebe515 | 20685:02df6998b466 |
|---|---|
| 149 | 149 |
| 150 if(!strcmp(status,"completed")) { | 150 if(!strcmp(status,"completed")) { |
| 151 /* display result */ | 151 /* display result */ |
| 152 xmlnode *note = xmlnode_get_child(command,"note"); | 152 xmlnode *note = xmlnode_get_child(command,"note"); |
| 153 | 153 |
| 154 if(note) | 154 if(note) { |
| 155 purple_notify_info(NULL, xmlnode_get_attrib(packet, "from"), xmlnode_get_data(note), NULL); | 155 char *data = xmlnode_get_data(note); |
| 156 purple_notify_info(NULL, xmlnode_get_attrib(packet, "from"), data, NULL); | |
| 157 g_free(data); | |
| 158 } | |
| 156 | 159 |
| 157 if(xdata) | 160 if(xdata) |
| 158 jabber_x_data_request(js, xdata, (jabber_x_data_cb)do_adhoc_ignoreme, NULL); | 161 jabber_x_data_request(js, xdata, (jabber_x_data_cb)do_adhoc_ignoreme, NULL); |
| 159 return; | 162 return; |
| 160 } | 163 } |