From 633694b7b4ce6a70c9adf6562e1be194fa85190b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 6 Sep 2012 08:11:47 +0200 Subject: [PATCH] Drop openoffice.org 1.x related hack for windowType detection The oo.o related hack can be removed for several reasons: 1. The dialog in question from bug 66065 is nowadays a utility 2. The window class name changed to libreoffice 3. It's not the task of the window manager to workaround bugs in Clients CCBUG: 66065 BUG: 306383 FIXED-IN: 4.9.2 --- toplevel.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/toplevel.cpp b/toplevel.cpp index 1174fa2ac1..b1af35aeb6 100644 --- a/toplevel.cpp +++ b/toplevel.cpp @@ -173,11 +173,6 @@ NET::WindowType Toplevel::windowType(bool direct, int supported_types) const info->setWindowType(wt); // force hint change } // hacks here - // TODO change this to rule - const char* const oo_prefix = "openoffice.org"; // QByteArray has no startsWith() - // oo_prefix is lowercase, because resourceClass() is forced to be lowercase - if (qstrncmp(resourceClass(), oo_prefix, strlen(oo_prefix)) == 0 && wt == NET::Dialog) - wt = NET::Normal; // see bug #66065 if (wt == NET::Unknown && cl != NULL) // this is more or less suggested in NETWM spec wt = cl->isTransient() ? NET::Dialog : NET::Normal; return wt;