andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/xwin: Remove XOpenDisplay() retry code

Browse Source 
Remove XOpenDisplay() retry code.  This isn't a sensible thing for the
application to be doing, and XWin server needs to retry much more than just
XOpenDisplay().

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2013-06-18 19:18:08 +01:00
parent 4fc62aef80
commit 4a38c3bda2
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/xwin/winclipboard/thread.c
View File

@ -111,7 +111,6 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay)
int iMaxDescriptor;
Display *pDisplay = NULL;
Window iWindow = None;
int iRetries;
int iSelectError;
Bool fShutdown = FALSE;
@ -140,26 +139,8 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay)
goto winClipboardProc_Done;
}
/* Initialize retry count */
iRetries = 0;
/* Open the X display */
do {
pDisplay = XOpenDisplay(szDisplay);
if (pDisplay == NULL) {
ErrorF("winClipboardProc - Could not open display, "
"try: %d, sleeping: %d\n", iRetries + 1, WIN_CONNECT_DELAY);
++iRetries;
sleep(WIN_CONNECT_DELAY);
continue;
}
else
break;
}
while (pDisplay == NULL && iRetries < WIN_CONNECT_RETRIES);
/* Make sure that the display opened */
pDisplay = XOpenDisplay(szDisplay);
if (pDisplay == NULL) {
ErrorF("winClipboardProc - Failed opening the display, giving up\n");
goto winClipboardProc_Done;