From f9c7f286716e1457f10365cf85e9924d4a2e869b Mon Sep 17 00:00:00 2001 From: Silenio Quarti Date: Mon, 27 Aug 2012 18:15:26 -0400 Subject: Bug 387496 - JVM crashes when running jdtuirefactoring tests on hudson: im-xim.so+0x3b04 (remove changes for bug#382812) --- .../Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java index 10b866506b..7993e54757 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java @@ -4266,12 +4266,14 @@ public boolean setParent (Composite parent) { * on a toolbar or on a widget hierarchy containing a toolbar. The fix is * to reparent by removing the widget from its current parent and adding it * to the new parent. + * + * Temporarily put back for bug#387496. */ -// OS.gtk_widget_reparent(topHandle, newParent); - OS.g_object_ref (topHandle); - OS.gtk_container_remove (OS.gtk_widget_get_parent (topHandle), topHandle); - OS.gtk_container_add (newParent, topHandle); - OS.g_object_unref (topHandle); + OS.gtk_widget_reparent(topHandle, newParent); +// OS.g_object_ref (topHandle); +// OS.gtk_container_remove (OS.gtk_widget_get_parent (topHandle), topHandle); +// OS.gtk_container_add (newParent, topHandle); +// OS.g_object_unref (topHandle); OS.gtk_fixed_move (newParent, topHandle, x, y); /* -- cgit