[Libreoffice-commits] .: Branch 'libreoffice-3-5-5' - vcl/unx

[Michael Meeks]

 vcl/unx/gtk/app/gtkdata.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0caef741da051161350de3b32a9da453ec7c4d16
Author: Ruslan Kabatsayev <b7.10110111 at gmail.com>
Date:   Mon Jun 18 17:23:46 2012 +0400

    GTK: don't crash on X errors
    
    Change-Id: I5b1353b409bc7043d2d1c313a3606ed807eced4b
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index c147f3e..fbc3b22 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -667,6 +667,7 @@ void GtkData::Init()
 
     // init gtk/gdk
     gtk_init_check( &nParams, &pCmdLineAry );
+    gdk_error_trap_push();
 
     for (i = 0; i < nParams; i++ )
         g_free( pCmdLineAry[i] );