user32: Revert old hack for popup windows in Gnome (eterbug #1837)

diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c
index 7d646b26dc7e9657a9520e88441ca826640ece33..707c677c43e32ada7e39d84c8b56512a0b05e74f 100644 (file)
--- a/dlls/user32/focus.c
+++ b/dlls/user32/focus.c
@@ -33,7 +33,6 @@
 #include "wine/server.h"
 #include "wine/debug.h"
 
-#define ETERSOFT_FUNC_GETWM
 #include "wine/etersoft.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(win);
@@ -140,23 +139,6 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus )
         if (SendMessageW( hwnd, WM_QUERYNEWPALETTE, 0, 0 ))
             SendMessageTimeoutW( HWND_BROADCAST, WM_PALETTEISCHANGING, (WPARAM)hwnd, 0,
                                  SMTO_ABORTIFHUNG, 2000, NULL );
-
-        /* This hack is needed to solve
-         * eterbug #1837 in Gnome only
-         */
-        LOADETER_FUNC(etersoft_getwm)
-        if (etersoft_getwm() == 2)
-        {
-            LOADETER_FUNC(etersoft_1version);
-            if ( etersoft_1version && ((etersoft_1version() == 8) || (etersoft_1version() == 7)) )
-            {
-                 if((!GetPropA( hwnd, "__wine_x11_managed" ) && (etersoft_1version() == 8))
-                    || (GetWindowLongW( hwnd, GWL_STYLE ) & WS_POPUP))
-                    SetWindowPos( hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE );
-            }
-            else
-                 SetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE );
-        }
         if (!IsWindow(hwnd)) return FALSE;
     }