vcl/unx/gtk/app/gtkdata.cxx | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 3a15168ae587cdc8f329ae049d0c1d1e9d9de21a
Author: Ruslan Kabatsayev <[email protected]>
Date: Mon Jun 18 17:23:46 2012 +0400
GTK: don't crash on X errors
Change-Id: I5b1353b409bc7043d2d1c313a3606ed807eced4b
Signed-off-by: Fridrich Å trba <[email protected]>
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 4d58110..07beacc 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -668,6 +668,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] );
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits