From 1fe909b122c8bbd1c82b95fef97801babdc4a5e4 Mon Sep 17 00:00:00 2001
From: onestone <onestone>
Date: Wed, 17 Jan 2007 15:49:00 +0000
Subject: aquamarine: fixed "On all desktops" menu setting

---
 src/window.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/window.cpp b/src/window.cpp
index f3c2c9a..e07456f 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -644,6 +644,7 @@ void
 Aquamarine::Window::setDesktop (int desktop)
 {
 	KWin::setOnDesktop (mClientId, desktop);
+	mDecor->desktopChange ();
 }
 
 void
@@ -1550,9 +1551,12 @@ void
 Aquamarine::Window::handleDesktopPopupActivated (int id)
 {
 	if (id)
-	setDesktop (id);
+	    setDesktop (id);
 	else
-	KWin::setOnAllDesktops (mClientId, true);
+	{
+	    setDesktop ((desktop () == NET::OnAllDesktops) ? 
+			KWin::currentDesktop() : NET::OnAllDesktops);
+	}
 }
 
 void
-- 
cgit v1.1