rev 9202 - in branches/kde4/packages/kdelibs/debian: . patches

[Adeodato Simó]

Author: adeodato
Date: 2008-01-31 12:52:58 +0000 (Thu, 31 Jan 2008)
New Revision: 9202

Added:
   branches/kde4/packages/kdelibs/debian/patches/r769072_make_stackingOrder_work.diff
Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/patches/series
Log:
One cherry pick that did not make into 4.0.1.


Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-01-31 12:48:09 UTC (rev 9201)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-01-31 12:52:58 UTC (rev 9202)
@@ -19,6 +19,13 @@
   * Add dbus-x11 dependency to kdelibs5. Thanks to Chris Desjardins.
   * Add Vcs-Browser and Vcs-Svn fields.
 
+  +++ Changes by Adeodato Simó:
+
+  * Cherry pick from /branches/KDE/4.0:
+
+    + r769072_make_stackingOrder_work: fix KWindowSystem::stackingOrder() to
+      actually return a non-empty list with the list of windows.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 19 Jan 2008 14:05:04 +0100
 
 kde4libs (4:4.0.0-2) unstable; urgency=low

Added: branches/kde4/packages/kdelibs/debian/patches/r769072_make_stackingOrder_work.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/r769072_make_stackingOrder_work.diff	                        (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/r769072_make_stackingOrder_work.diff	2008-01-31 12:52:58 UTC (rev 9202)
@@ -0,0 +1,43 @@
+--- a/kdeui/windowmanagement/kwindowsystem_x11.cpp
++++ b/kdeui/windowmanagement/kwindowsystem_x11.cpp
+@@ -56,7 +56,9 @@
+ 				     NET::WorkArea |
+                                      NET::WM2ShowingDesktop };
+ 
+-static unsigned long desktop_properties[ 2 ] = { NET::ClientList |
++// ClientList and ClientListStacking is not per-window information, but a desktop information,
++// so track it even with only INFO_BASIC
++static unsigned long desktop_properties[ 2 ] = { NET::ClientList | NET::ClientListStacking |
+                                      NET::Supported |
+ 				     NET::NumberOfDesktops |
+ 				     NET::DesktopGeometry |
+@@ -72,6 +74,7 @@
+ {
+ public:
+     KWindowSystemPrivate(int _what);
++    void activate();
+     QList<WId> windows;
+     QList<WId> stackingOrder;
+ 
+@@ -110,6 +113,12 @@
+     if (kapp)
+         kapp->installX11EventFilter( this );
+     (void ) qApp->desktop(); //trigger desktop widget creation to select root window events
++}
++
++// not virtual, but it's called directly only from init()
++void KWindowSystemPrivate::activate()
++{
++    NETRootInfo::activate();
+     updateStackingOrder();
+ }
+ 
+@@ -325,8 +334,6 @@
+         what = INFO_WINDOWS;
+     else if( QLatin1String( signal ) == SIGNAL(strutChanged()))
+         what = INFO_WINDOWS;
+-    else if( QLatin1String( signal ) == SIGNAL(stackingOrderChanged()))
+-        what = INFO_WINDOWS;
+     else if( QLatin1String( signal ) == QMetaObject::normalizedSignature(SIGNAL(windowChanged(WId,const unsigned long*))).data())
+         what = INFO_WINDOWS;
+     else if( QLatin1String( signal ) ==  QMetaObject::normalizedSignature(SIGNAL(windowChanged(WId,unsigned int))).data())

Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series	2008-01-31 12:48:09 UTC (rev 9201)
+++ branches/kde4/packages/kdelibs/debian/patches/series	2008-01-31 12:52:58 UTC (rev 9202)
@@ -7,3 +7,4 @@
 14_hardcode_ptm_device.diff
 15_kfreebsd_support.diff
 16_arm_fixes.diff
+r769072_make_stackingOrder_work.diff