diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-25 08:32:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-25 08:32:37 +0200 |
| commit | acf3535c75d7c79154b6b89c66567317944d244c (patch) | |
| tree | 8fcc57fc152d9c594e3119678a6f5d8f0160267b /xorg-server/hw/xwin/winclipboardthread.c | |
| parent | 5c340ceb9356ea029dea53b73440268d4769d5a5 (diff) | |
| download | vcxsrv-acf3535c75d7c79154b6b89c66567317944d244c.tar.gz vcxsrv-acf3535c75d7c79154b6b89c66567317944d244c.tar.bz2 vcxsrv-acf3535c75d7c79154b6b89c66567317944d244c.zip | |
xserver mesa git update 25 Jul 2013
xserver commit 43ac0491e36cdbb716b5c9d39c97d0aba3bebd75
mesa commit 8a9df7a370b66ec50b6255e4d66ac1ed331319fb
Diffstat (limited to 'xorg-server/hw/xwin/winclipboardthread.c')
| -rw-r--r-- | xorg-server/hw/xwin/winclipboardthread.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/xorg-server/hw/xwin/winclipboardthread.c b/xorg-server/hw/xwin/winclipboardthread.c index 6da9f3b72..33595be7f 100644 --- a/xorg-server/hw/xwin/winclipboardthread.c +++ b/xorg-server/hw/xwin/winclipboardthread.c @@ -325,14 +325,7 @@ winClipboardProc(void *pvNotUsed) /* Branch on which descriptor became active */ if (FD_ISSET(iConnectionNumber, &fdsRead)) { /* Process X events */ - /* Exit when we see that server is shutting down */ - iReturn = winClipboardFlushXEvents(hwnd, - iWindow, pDisplay, fUseUnicode); - if (WIN_XEVENTS_SHUTDOWN == iReturn) { - ErrorF("winClipboardProc - winClipboardFlushXEvents " - "trapped shutdown event, exiting main loop.\n"); - break; - } + winClipboardFlushXEvents(hwnd, iWindow, pDisplay, fUseUnicode); } #ifdef HAS_DEVWINDOWS @@ -460,7 +453,7 @@ winClipboardErrorHandler(Display * pDisplay, XErrorEvent * pErr) static int winClipboardIOErrorHandler(Display * pDisplay) { - ErrorF("winClipboardIOErrorHandler!\n\n"); + ErrorF("winClipboardIOErrorHandler!\n"); if (pthread_equal(pthread_self(), g_winClipboardProcThread)) { /* Restart at the main entry point */ |