summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2013-06-18 19:21:02 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2013-07-23 23:59:37 +0100
commit4bc375aa2f08bd092f60d3e358d345fc9a0d3637 (patch)
treebb08486f5263ec24c645d56cf9061ab3eba83455
parent2663203cd6994166e107e796c4724a4ed3b59370 (diff)
hw/xwin: Remove obsolete WIN_XEVENTS_SHUTDOWN
Remove obsolete WIN_XEVENTS_SHUTDOWN. This event is never generated. (I think the idea was to listen for WM_DELETE_WINDOW, but that's not a very useful thing to do for a hidden window.) Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
-rw-r--r--hw/xwin/winclipboard.h1
-rw-r--r--hw/xwin/winclipboardthread.c9
2 files changed, 1 insertions, 9 deletions
diff --git a/hw/xwin/winclipboard.h b/hw/xwin/winclipboard.h
index 2cd775d6b..aa7fd4468 100644
--- a/hw/xwin/winclipboard.h
+++ b/hw/xwin/winclipboard.h
@@ -66,7 +66,6 @@
#define WIN_JMP_ERROR_IO 2
#define WIN_LOCAL_PROPERTY "CYGX_CUT_BUFFER"
#define WIN_XEVENTS_SUCCESS 0
-#define WIN_XEVENTS_SHUTDOWN 1
#define WIN_XEVENTS_CONVERT 2
#define WIN_XEVENTS_NOTIFY 3
#define WIN_CLIPBOARD_RETRIES 40
diff --git a/hw/xwin/winclipboardthread.c b/hw/xwin/winclipboardthread.c
index 69c654dc7..33595be7f 100644
--- a/hw/xwin/winclipboardthread.c
+++ b/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