Mercurial > hg > release > icedtea6-1.6
changeset 1735:f5cff4063cf3
Revert behaviour of isOverrideRedirect to always return false, since XToolKit
does not support isOverrideRedirect (as upstream patch assumes).
| author | Deepak Bhole <dbhole@redhat.com> |
|---|---|
| date | Fri, 16 Jul 2010 16:56:44 -0400 |
| parents | 18fa77d40df5 |
| children | 77b720a556d3 |
| files | ChangeLog patches/openjdk/6678385.patch |
| diffstat | 2 files changed, 6 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jul 16 16:53:35 2010 -0400 +++ b/ChangeLog Fri Jul 16 16:56:44 2010 -0400 @@ -1,3 +1,9 @@ +2010-07-15 Deepak Bhole <dbhole@redhat.com> + + * patches/openjdk/6678385.patch: Revert behaviour of isOverrideRedirect to + always return false, since XToolKit does not support isOverrideRedirect (as + upstream patch assumes). + 2010-07-16 Deepak Bhole <dbhole@redhat.com> * patches/icedtea-policy-evaluation.patch: New patch. Fixes policy
--- a/patches/openjdk/6678385.patch Fri Jul 16 16:53:35 2010 -0400 +++ b/patches/openjdk/6678385.patch Fri Jul 16 16:56:44 2010 -0400 @@ -231,19 +231,6 @@ if (status != XlibWrapper.Success || getter.getData() == 0) { if (log.isLoggable(Level.FINE)) log.fine("OH OH : getter failed status = " + status ); -diff -uNr openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java 2010-07-15 10:28:21.895105718 -0400 -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java 2010-07-15 10:28:42.640232090 -0400 -@@ -1155,7 +1155,8 @@ - } - - boolean isOverrideRedirect() { -- return false; -+// return false; -+ return ((XToolkit)Toolkit.getDefaultToolkit()).isOverrideRedirect((Window)target); - } - - public boolean requestWindowFocus(long time, boolean timeProvided) { diff -uNr openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java openjdk/jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java --- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java 2010-07-15 10:28:21.906105640 -0400 +++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java 2010-07-15 10:28:42.642232277 -0400