From: VMware, Inc <>
Date: Thu, 18 Nov 2010 21:50:06 +0000 (-0800)
Subject: Unity: Fix SetDesktopConfig handling.
X-Git-Tag: 2010.11.17-327185~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6f0261ed2d63e7d2bbfa161003aa1975714580d;p=thirdparty%2Fopen-vm-tools.git

Unity: Fix SetDesktopConfig handling.

The work which factored TCLO handling out of lib/unity introduced a
regression whereby Unity_SetDesktopConfig no longer updated the
unity.virtDesktopArray state variable.  This caused all subsequent
calls relating to virtual desktops, Unity_SetDesktopActive and
Unity_SetWindowDesktop, to fail.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/services/plugins/unity/unitylib/unity.c b/open-vm-tools/services/plugins/unity/unitylib/unity.c
index 177b71827..6765d099f 100644
--- a/open-vm-tools/services/plugins/unity/unitylib/unity.c
+++ b/open-vm-tools/services/plugins/unity/unitylib/unity.c
@@ -893,7 +893,11 @@ Unity_MoveResizeWindow(UnityWindowId window,      // IN: Window handle
 Bool
 Unity_SetDesktopConfig(const UnityVirtualDesktopArray *desktopConfig) // IN
 {
-   return UnityPlatformSetDesktopConfig(unity.up, desktopConfig);
+   if (UnityPlatformSetDesktopConfig(unity.up, desktopConfig)) {
+      unity.virtDesktopArray = *desktopConfig;
+      return TRUE;
+   }
+   return FALSE;
 }