src/solaris/classes/sun/awt/X11/XWM.java

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 280,295 ****
              }
  
              winmgr_running = false;
              substruct.set_event_mask(XConstants.SubstructureRedirectMask);
  
!             XToolkit.WITH_XERROR_HANDLER(detectWMHandler);
              XlibWrapper.XChangeWindowAttributes(XToolkit.getDisplay(),
                                                  XToolkit.getDefaultRootWindow(),
                                                  XConstants.CWEventMask,
                                                  substruct.pData);
!             XToolkit.RESTORE_XERROR_HANDLER();
  
              /*
               * If no WM is running then our selection for SubstructureRedirect
               * succeeded and needs to be undone (hey we are *not* a WM ;-).
               */
--- 280,295 ----
              }
  
              winmgr_running = false;
              substruct.set_event_mask(XConstants.SubstructureRedirectMask);
  
!             XErrorHandlerUtil.WITH_XERROR_HANDLER(detectWMHandler);
              XlibWrapper.XChangeWindowAttributes(XToolkit.getDisplay(),
                                                  XToolkit.getDefaultRootWindow(),
                                                  XConstants.CWEventMask,
                                                  substruct.pData);
!             XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
  
              /*
               * If no WM is running then our selection for SubstructureRedirect
               * succeeded and needs to be undone (hey we are *not* a WM ;-).
               */
*** 614,632 ****
              return false;
          }
  
          XToolkit.awtLock();
          try {
!             XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
              XlibWrapper.XChangePropertyS(XToolkit.getDisplay(), XToolkit.getDefaultRootWindow(),
                                           XA_ICEWM_WINOPTHINT.getAtom(),
                                           XA_ICEWM_WINOPTHINT.getAtom(),
                                           8, XConstants.PropModeReplace,
                                           new String(opt));
!             XToolkit.RESTORE_XERROR_HANDLER();
  
!             if (XToolkit.saved_error != null && XToolkit.saved_error.get_error_code() != XConstants.Success) {
                  log.finer("Erorr getting XA_ICEWM_WINOPTHINT property");
                  return false;
              }
              log.finer("Prepared for IceWM detection");
              return true;
--- 614,633 ----
              return false;
          }
  
          XToolkit.awtLock();
          try {
!             XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
              XlibWrapper.XChangePropertyS(XToolkit.getDisplay(), XToolkit.getDefaultRootWindow(),
                                           XA_ICEWM_WINOPTHINT.getAtom(),
                                           XA_ICEWM_WINOPTHINT.getAtom(),
                                           8, XConstants.PropModeReplace,
                                           new String(opt));
!             XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
  
!             if ((XErrorHandlerUtil.saved_error != null) &&
!                 (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
                  log.finer("Erorr getting XA_ICEWM_WINOPTHINT property");
                  return false;
              }
              log.finer("Prepared for IceWM detection");
              return true;