Mercurial > pidgin.yaz
changeset 23209:f8a02ba588d1
merge of '740f6d249277d1f3ffc01d5fab1a580c2dd8fc79'
and 'c22d824152072143b7ba7eb8b365c97069c60761'
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Mon, 26 May 2008 02:16:05 +0000 |
| parents | 66ccd61eaff6 (diff) eab3ce582cac (current diff) |
| children | d3fb9d9b57e2 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkimhtml.c Sun May 25 23:48:50 2008 +0000 +++ b/pidgin/gtkimhtml.c Mon May 26 02:16:05 2008 +0000 @@ -1001,19 +1001,14 @@ char *selection; #ifndef _WIN32 gsize len; - GString *str = g_string_new(NULL); if (primary) { text = gtk_imhtml_get_markup_range(imhtml, &start, &end); } else text = html_clipboard; /* Mozilla asks that we start our text/html with the Unicode byte order mark */ - str = g_string_append_unichar(str, 0xfeff); - str = g_string_append(str, text); - str = g_string_append_unichar(str, 0x0000); - selection = g_convert(str->str, str->len, "UTF-16", "UTF-8", NULL, &len, NULL); + selection = g_convert(text, -1, "UTF-16", "UTF-8", NULL, &len, NULL); gtk_selection_data_set(selection_data, gdk_atom_intern("text/html", FALSE), 16, (const guchar *)selection, len); - g_string_free(str, TRUE); #else selection = clipboard_html_to_win32(html_clipboard); gtk_selection_data_set(selection_data, gdk_atom_intern("HTML Format", FALSE), 8, (const guchar *)selection, strlen(selection));