Mercurial > pidgin.yaz
changeset 30374:9945fe7098f7
merge of '8ff2ee29eabe00715f5da3d756f3bf52b9509879'
and 'cfa223b3386ae5aea84acf03fb9eb9b741364d29'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Sun, 16 May 2010 17:12:25 +0000 |
| parents | 23406bea038f (diff) b3377040edc1 (current diff) |
| children | 04c84a3f9553 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkimhtml.c Sun May 16 15:57:51 2010 +0000 +++ b/pidgin/gtkimhtml.c Sun May 16 17:12:25 2010 +0000 @@ -1262,7 +1262,7 @@ #ifdef _WIN32 /* If we're on windows, let's see if we can get data from the HTML Format clipboard before we try to paste from the GTK buffer */ - if (!clipboard_paste_html_win32(imhtml)) { + if (!clipboard_paste_html_win32(imhtml) && gtk_text_view_get_editable(GTK_TEXT_VIEW(imhtml))) { GtkClipboard *clipboard = gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_CLIPBOARD); gtk_clipboard_request_text(clipboard, paste_plaintext_received_cb, imhtml);