comparison: libpurple/protocols/myspace/markup.c
libpurple/protocols/myspace/markup.c
- changeset 20720
- f1ee0fdfcc0a
- parent 20671
- d063e09fb180
- child 20747
- c7494ef1530d
- child 20791
- 0ce6682959f1
equal
deleted
inserted
replaced
| 20719:ce876ae5fb7d | 20720:f1ee0fdfcc0a |
|---|---|
| 256 g_string_append(gs_begin, "<u>"); | 256 g_string_append(gs_begin, "<u>"); |
| 257 g_string_append(gs_end, "</u>"); | 257 g_string_append(gs_end, "</u>"); |
| 258 } | 258 } |
| 259 | 259 |
| 260 | 260 |
| 261 *begin = gs_begin->str; | 261 *begin = g_string_free(gs_begin, FALSE); |
| 262 *end = gs_end->str; | 262 *end = g_string_free(gs_end, FALSE); |
| 263 } | 263 } |
| 264 | 264 |
| 265 /** Convert a msim markup color to a color suitable for libpurple. | 265 /** Convert a msim markup color to a color suitable for libpurple. |
| 266 * | 266 * |
| 267 * @param msim Either a color name, or an rgb(x,y,z) code. | 267 * @param msim Either a color name, or an rgb(x,y,z) code. |
| 594 g_string_append(final, end); | 594 g_string_append(final, end); |
| 595 | 595 |
| 596 purple_debug_info("msim", "msim_markup_xmlnode_to_gtkhtml: RETURNING %s\n", | 596 purple_debug_info("msim", "msim_markup_xmlnode_to_gtkhtml: RETURNING %s\n", |
| 597 (final && final->str) ? final->str : "(NULL)"); | 597 (final && final->str) ? final->str : "(NULL)"); |
| 598 | 598 |
| 599 return final->str; | 599 return g_string_free(final, FALSE); |
| 600 } | 600 } |
| 601 | 601 |
| 602 /** Convert XML to something based on MSIM_XMLNODE_CONVERT. */ | 602 /** Convert XML to something based on MSIM_XMLNODE_CONVERT. */ |
| 603 static gchar * | 603 static gchar * |
| 604 msim_convert_xml(MsimSession *session, const gchar *raw, MSIM_XMLNODE_CONVERT f) | 604 msim_convert_xml(MsimSession *session, const gchar *raw, MSIM_XMLNODE_CONVERT f) |
