diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-18 08:33:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-18 08:33:31 +0200 |
| commit | 2ff5448bcca8cba4b62026d5493cb08aaf2838d8 (patch) | |
| tree | 355bad312548535d148aa058c089aefc81e10ab3 /xorg-server/hw/xwin/winclipboardwndproc.c | |
| parent | d09d7be8bbbb39926f44834023d7120535155829 (diff) | |
| download | vcxsrv-2ff5448bcca8cba4b62026d5493cb08aaf2838d8.tar.gz vcxsrv-2ff5448bcca8cba4b62026d5493cb08aaf2838d8.tar.bz2 vcxsrv-2ff5448bcca8cba4b62026d5493cb08aaf2838d8.zip | |
fontconfig mesa xserver git update 18 Jul 2012
Diffstat (limited to 'xorg-server/hw/xwin/winclipboardwndproc.c')
| -rw-r--r-- | xorg-server/hw/xwin/winclipboardwndproc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xorg-server/hw/xwin/winclipboardwndproc.c b/xorg-server/hw/xwin/winclipboardwndproc.c index 78b061517..cbe6599f4 100644 --- a/xorg-server/hw/xwin/winclipboardwndproc.c +++ b/xorg-server/hw/xwin/winclipboardwndproc.c @@ -49,7 +49,6 @@ */ extern Bool g_fUseUnicode; -extern Bool g_fUnicodeSupport; extern void *g_pClipboardDisplay; extern Window g_iClipboardWindow; extern Atom g_atomLastOwnedSelection; @@ -60,6 +59,7 @@ extern Atom g_atomLastOwnedSelection; static int + winProcessXEventsTimeout(HWND hwnd, int iWindow, Display * pDisplay, Bool fUseUnicode, int iTimeoutSec); @@ -415,7 +415,7 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) if (message == WM_RENDERALLFORMATS) fConvertToUnicode = FALSE; else - fConvertToUnicode = g_fUnicodeSupport && (CF_UNICODETEXT == wParam); + fConvertToUnicode = (CF_UNICODETEXT == wParam); /* Request the selection contents */ iReturn = XConvertSelection(pDisplay, @@ -470,8 +470,7 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) */ if (WIN_XEVENTS_NOTIFY != iReturn) { /* Paste no data, to satisfy required call to SetClipboardData */ - if (g_fUnicodeSupport) - SetClipboardData(CF_UNICODETEXT, NULL); + SetClipboardData(CF_UNICODETEXT, NULL); SetClipboardData(CF_TEXT, NULL); ErrorF |