comparison: libpurple/util.c
libpurple/util.c
- branch
- release-2.2.3
- changeset 20288
- 5ca925a094e2
- parent 20263
- 6a3888aa5213
- child 20292
- 470dea577276
equal
deleted
inserted
replaced
| 20287:4a25d4144f16 | 20288:5ca925a094e2 |
|---|---|
| 1657 c = p; | 1657 c = p; |
| 1658 pt = g_new0(struct purple_parse_tag, 1); | 1658 pt = g_new0(struct purple_parse_tag, 1); |
| 1659 pt->src_tag = "font"; | 1659 pt->src_tag = "font"; |
| 1660 pt->dest_tag = "span"; | 1660 pt->dest_tag = "span"; |
| 1661 tags = g_list_prepend(tags, pt); | 1661 tags = g_list_prepend(tags, pt); |
| 1662 if(style->len) | 1662 if(style->len && xhtml) |
| 1663 g_string_append_printf(xhtml, "<span style='%s'>", g_strstrip(style->str)); | 1663 g_string_append_printf(xhtml, "<span style='%s'>", g_strstrip(style->str)); |
| 1664 else | 1664 else |
| 1665 pt->ignore = TRUE; | 1665 pt->ignore = TRUE; |
| 1666 g_string_free(style, TRUE); | 1666 g_string_free(style, TRUE); |
| 1667 continue; | 1667 continue; |
| 3082 if (text[i] == '\n' && text[i - 1] != '\r') | 3082 if (text[i] == '\n' && text[i - 1] != '\r') |
| 3083 ret[j++] = '\r'; | 3083 ret[j++] = '\r'; |
| 3084 ret[j++] = text[i]; | 3084 ret[j++] = text[i]; |
| 3085 } | 3085 } |
| 3086 | 3086 |
| 3087 purple_debug_misc("purple_str_add_cr", "got: %s, leaving with %s\n", | |
| 3088 text, ret); | |
| 3089 | |
| 3090 return ret; | 3087 return ret; |
| 3091 } | 3088 } |
| 3092 | 3089 |
| 3093 void | 3090 void |
| 3094 purple_str_strip_char(char *text, char thechar) | 3091 purple_str_strip_char(char *text, char thechar) |
