1 files changed, 0 insertions, 58 deletions
diff --git a/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff b/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff
deleted file mode 100644
index ba1a588e1..000000000
--- a/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff
+++ /dev/null
@@ -1,58 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig	2011-08-07 18:45:05.000000000 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java	2011-08-07 18:45:54.000000000 +0200
-@@ -102,7 +102,8 @@
-         METACITY_WM = 11,
-         COMPIZ_WM = 12,
-         LG3D_WM = 13,
--        MUTTER_WM = 14;
-+        MUTTER_WM = 14,
-+        OTHER_NONREPARENTING_WM = 15;
-     public String toString() {
-         switch  (WMID) {
-           case NO_WM:
-@@ -576,7 +577,7 @@
-     // TODO: according to wikipedia, compiz is now reparenting. This should
-     // probably be updated.
-     static boolean isNonReparentingWM() {
--        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM);
-+        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
-     }
- 
-     /*
-@@ -762,9 +763,17 @@
-              * supports WIN or _NET wm spec.
-              */
-             else if (l_net_protocol.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+		}
-             } else if (win.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+		}
-             }
-             /*
-              * Check for legacy WMs.
-@@ -775,6 +784,8 @@
-                 awt_wmgr = XWM.MOTIF_WM;
-             } else if (isOpenLook()) {
-                 awt_wmgr = XWM.OPENLOOK_WM;
-+            } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-             } else {
-                 awt_wmgr = XWM.OTHER_WM;
-             }
-@@ -1289,6 +1300,7 @@
-                   res = new Insets(28, 6, 6, 6);
-                   break;
-               case NO_WM:
-+              case OTHER_NONREPARENTING_WM:
-               case LG3D_WM:
-                   res = zeroInsets;
-                   break;