Module: wine Branch: master Commit: 662653c8ff55d71e60738e455f93f261b48beb9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=662653c8ff55d71e60738e455f...
Author: Roderick Colenbrander thunderbird2k@gmail.com Date: Tue Dec 8 13:11:20 2009 +0100
winex11: Move X11 display failure MESSAGE to winediag.
---
dlls/winex11.drv/x11drv_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 3600cd0..3bd934b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -56,6 +56,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(x11drv); WINE_DECLARE_DEBUG_CHANNEL(synchronous); +WINE_DECLARE_DEBUG_CHANNEL(winediag);
static CRITICAL_SECTION X11DRV_CritSection; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -643,8 +644,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) if (!(data->display = XOpenDisplay(NULL))) { wine_tsx11_unlock(); - MESSAGE( "x11drv: Can't open display: %s\n", XDisplayName(NULL) ); - MESSAGE( "Please ensure that your X server is running and that $DISPLAY is set correctly.\n" ); + ERR_(winediag)( "x11drv: Can't open display: %s. Please ensure that your X server is running and that $DISPLAY is set correctly.\n", XDisplayName(NULL)); ExitProcess(1); }