[Libreoffice-commits] core.git: vcl/unx

[Stephan Bergmann]

 vcl/unx/gtk/app/gtkdata.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit b240a1c188b58e3e717335339bfc3f5e20bb2bf4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Aug 23 13:13:14 2013 +0200

    rhbz#1000150: Do not call exit upon XIOError, take two
    
    The _XDefaultIOError handler (libX11-1.6.0/src/XlibInt.c) already calls exit
    (even though _XIOError calling _XDefaultIOError would call exit afterwards,
    too), so our XIOError handler must not call aOrigXIOErrorHandler.
    
    Change-Id: I92655f22d25ec1358fb6234c94fdfab368efedba

diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 0df6b10..c2ec520 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -511,10 +511,9 @@ GtkData::GtkData( SalInstance *pInstance )
 
 XIOErrorHandler aOrigXIOErrorHandler = NULL;
 
-int XIOErrorHdl(Display *pDisplay)
+int XIOErrorHdl(Display *)
 {
-    if (aOrigXIOErrorHandler)
-        aOrigXIOErrorHandler(pDisplay);
+    fprintf(stderr, "X IO Error\n");
     _exit(1);
         // avoid crashes in unrelated threads that still run while atexit
         // handlers are in progress