From 22982b9e95a2339d5ba60d66263e42a0331ee41f Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Thu, 29 Oct 2009 18:50:23 +0000 Subject: [PATCH] Cygwin/X: XSupportsLocale() failure is non-critical Treat XSupportsLocale() returning false as non-critical to internal client theads startup, and issue a warning, not an error Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/winclipboardthread.c | 3 +-- hw/xwin/winmultiwindowwm.c | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hw/xwin/winclipboardthread.c b/hw/xwin/winclipboardthread.c index e5b2dc1e0..a3809034e 100644 --- a/hw/xwin/winclipboardthread.c +++ b/hw/xwin/winclipboardthread.c @@ -119,8 +119,7 @@ winClipboardProc (void *pvNotUsed) /* See if X supports the current locale */ if (XSupportsLocale () == False) { - ErrorF ("winClipboardProc - Locale not supported by X. Exiting.\n"); - pthread_exit (NULL); + ErrorF ("winClipboardProc - Warning: Locale not supported by X.\n"); } /* Set jump point for Error exits */ diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c index eba5542ac..e39cbc105 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -893,9 +893,7 @@ winMultiWindowXMsgProc (void *pArg) /* See if X supports the current locale */ if (XSupportsLocale () == False) { - ErrorF ("winMultiWindowXMsgProc - Locale not supported by X. " - "Exiting.\n"); - pthread_exit (NULL); + ErrorF ("winMultiWindowXMsgProc - Warning: locale not supported by X\n"); } /* Release the server started mutex */ @@ -1278,8 +1276,7 @@ winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg) /* See if X supports the current locale */ if (XSupportsLocale () == False) { - ErrorF ("winInitMultiWindowWM - Locale not supported by X. Exiting.\n"); - pthread_exit (NULL); + ErrorF ("winInitMultiWindowWM - Warning: Locale not supported by X.\n"); } /* Release the server started mutex */