comparison: libpurple/protocols/myspace/markup.c
libpurple/protocols/myspace/markup.c
- branch
- release-2.2.1
- changeset 20139
- f0cc6a81a9b3
- parent 19859
- 71d37b57eff2
- child 20166
- 49c243c1fe12
- child 20747
- c7494ef1530d
equal
deleted
inserted
replaced
| 20138:9d157e9beff9 | 20139:f0cc6a81a9b3 |
|---|---|
| 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. |
| 580 g_string_append(final, end); | 580 g_string_append(final, end); |
| 581 | 581 |
| 582 purple_debug_info("msim", "msim_markup_xmlnode_to_gtkhtml: RETURNING %s\n", | 582 purple_debug_info("msim", "msim_markup_xmlnode_to_gtkhtml: RETURNING %s\n", |
| 583 (final && final->str) ? final->str : "(NULL)"); | 583 (final && final->str) ? final->str : "(NULL)"); |
| 584 | 584 |
| 585 return final->str; | 585 return g_string_free(final, FALSE); |
| 586 } | 586 } |
| 587 | 587 |
| 588 /** Convert XML to something based on MSIM_XMLNODE_CONVERT. */ | 588 /** Convert XML to something based on MSIM_XMLNODE_CONVERT. */ |
| 589 static gchar * | 589 static gchar * |
| 590 msim_convert_xml(MsimSession *session, const gchar *raw, MSIM_XMLNODE_CONVERT f) | 590 msim_convert_xml(MsimSession *session, const gchar *raw, MSIM_XMLNODE_CONVERT f) |
