Mercurial > pidgin.yaz
comparison libpurple/xmlnode.c @ 27275:916f266aca98
merge of '1356d70e521b4cb5ab8ea10f0927063b5c62394a'
and '6e02b385a7decbbfdad9bc91c80b0bc86fbd8129'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 27 Jun 2009 17:50:49 +0000 |
| parents | 01f1929d0936 |
| children | f1437342cc0e |
comparison
equal
deleted
inserted
replaced
| 27154:cb3e89f5a2d5 | 27275:916f266aca98 |
|---|---|
| 380 g_strfreev(names); | 380 g_strfreev(names); |
| 381 return ret; | 381 return ret; |
| 382 } | 382 } |
| 383 | 383 |
| 384 char * | 384 char * |
| 385 xmlnode_get_data(xmlnode *node) | 385 xmlnode_get_data(const xmlnode *node) |
| 386 { | 386 { |
| 387 GString *str = NULL; | 387 GString *str = NULL; |
| 388 xmlnode *c; | 388 xmlnode *c; |
| 389 | 389 |
| 390 g_return_val_if_fail(node != NULL, NULL); | 390 g_return_val_if_fail(node != NULL, NULL); |
| 403 | 403 |
| 404 return g_string_free(str, FALSE); | 404 return g_string_free(str, FALSE); |
| 405 } | 405 } |
| 406 | 406 |
| 407 char * | 407 char * |
| 408 xmlnode_get_data_unescaped(xmlnode *node) | 408 xmlnode_get_data_unescaped(const xmlnode *node) |
| 409 { | 409 { |
| 410 char *escaped = xmlnode_get_data(node); | 410 char *escaped = xmlnode_get_data(node); |
| 411 | 411 |
| 412 char *unescaped = escaped ? purple_unescape_html(escaped) : NULL; | 412 char *unescaped = escaped ? purple_unescape_html(escaped) : NULL; |
| 413 | 413 |