changeset in /hg/icedtea6: Add icedtea-override-redirect-metacit...

[Mark Wielaard]

changeset ebc064e8892d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ebc064e8892d
description:
	Add icedtea-override-redirect-metacity.patch.

	2008-05-26  Mark Wielaard  <mwielaard at redhat.com>

	       * Makefile.am (ICEDTEA_PATCHES): Add
	       patches/icedtea-override-redirect-metacity.patch.
	       * Makefile.in: Regenerate.
	       * patches/icedtea-override-redirect-metacity.patch: New patch.

diffstat:

4 files changed, 29 insertions(+), 1 deletion(-)
ChangeLog                                        |    7 +++++++
Makefile.am                                      |    1 +
Makefile.in                                      |    3 ++-
patches/icedtea-override-redirect-metacity.patch |   19 +++++++++++++++++++

diffs (61 lines):

diff -r ecc9e751b854 -r ebc064e8892d ChangeLog
--- a/ChangeLog	Sun May 25 21:33:04 2008 +0200
+++ b/ChangeLog	Mon May 26 11:29:25 2008 +0200
@@ -1,3 +1,10 @@ 2008-05-25  Mark Wielaard  <mark at klomp.o
+2008-05-26  Mark Wielaard  <mwielaard at redhat.com>
+
+	* Makefile.am (ICEDTEA_PATCHES): Add
+	patches/icedtea-override-redirect-metacity.patch.
+	* Makefile.in: Regenerate.
+	* patches/icedtea-override-redirect-metacity.patch: New patch.
+
 2008-05-25  Mark Wielaard  <mark at klomp.org>
 
 	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
diff -r ecc9e751b854 -r ebc064e8892d Makefile.am
--- a/Makefile.am	Sun May 25 21:33:04 2008 +0200
+++ b/Makefile.am	Mon May 26 11:29:25 2008 +0200
@@ -315,6 +315,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-hat-spl-gpl.patch \
 	patches/icedtea-sparc.patch \
+	patches/icedtea-override-redirect-metacity.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r ecc9e751b854 -r ebc064e8892d Makefile.in
--- a/Makefile.in	Sun May 25 21:33:04 2008 +0200
+++ b/Makefile.in	Mon May 26 11:29:25 2008 +0200
@@ -417,7 +417,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
-	$(GCC_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_7)
+	patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
+	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
diff -r ecc9e751b854 -r ebc064e8892d patches/icedtea-override-redirect-metacity.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-override-redirect-metacity.patch	Mon May 26 11:29:25 2008 +0200
@@ -0,0 +1,19 @@
+--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java.orig	2008-05-25 17:31:31.000000000 +0200
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java	2008-05-25 17:33:32.000000000 +0200
+@@ -133,6 +133,7 @@
+     private static final int MAXIMUM_BUFFER_LENGTH_NET_WM_ICON = (2<<15) - 1;
+ 
+     void preInit(XCreateWindowParams params) {
++        target = (Component)params.get(TARGET);
+         params.put(REPARENTED,
+                    Boolean.valueOf(isOverrideRedirect() || isSimpleWindow()));
+         super.preInit(params);
+@@ -1122,6 +1123,8 @@
+ 
+     boolean isOverrideRedirect() {
+         return (XWM.getWMID() == XWM.OPENLOOK_WM ? true : false) ||
++            (XWM.getWMID() == XWM.METACITY_WM ? true : false) ||
++            target.getName().equals("###overrideRedirect###") ||
+             XTrayIconPeer.isTrayIconStuffWindow((Window)target);
+     }
+