Mercurial > pidgin.yaz
changeset 23196:66ccd61eaff6
merge of 'd993fb67df1d01ad9a8a18fef3e8a5de90823875'
and 'da43d67131d318f67d21afc95a349c3ab8ef8c92'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sun, 25 May 2008 23:48:57 +0000 |
| parents | 7e0b815d2133 (current diff) ed61297e80c8 (diff) |
| children | d54bc04bfd31 f8a02ba588d1 |
| files | pidgin/gtkimhtml.c |
| diffstat | 1 files changed, 1 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkimhtml.c Sun May 25 22:06:51 2008 +0000 +++ b/pidgin/gtkimhtml.c Sun May 25 23:48:57 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));