From: VMware, Inc <>
Date: Tue, 19 Oct 2010 20:06:19 +0000 (-0700)
Subject: unity: Remove UnityPlatformWillRemoveWindow().
X-Git-Tag: 2010.10.18-313025~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87bbd4de95052bbf64d520b0133c45e4a72cb1bb;p=thirdparty%2Fopen-vm-tools.git

unity: Remove UnityPlatformWillRemoveWindow().

Since we now get a window event whenever a window is destroyed, this
function is no longer needed.

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 3f50b7ac3..177b71827 100644
--- a/open-vm-tools/services/plugins/unity/unitylib/unity.c
+++ b/open-vm-tools/services/plugins/unity/unitylib/unity.c
@@ -745,21 +745,6 @@ void
 UnityUpdateCallbackFn(void *param,          // IN: UnityPlatform
                       UnityUpdate *update)  // IN
 {
-   UnityPlatform *up = (UnityPlatform*)param;
-   switch (update->type) {
-
-   case UNITY_UPDATE_REMOVE_WINDOW:
-      /*
-       * Let the platform know that this window has been removed. This is
-       * useful on platforms that must poll for window changes.
-       */
-      UnityPlatformWillRemoveWindow(up, update->u.removeWindow.id);
-      break;
-
-   default:
-      break;
-   }
-
    unity.hostCallbacks.updateCB(unity.hostCallbacks.updateCbCtx, update);
 }
 
diff --git a/open-vm-tools/services/plugins/unity/unitylib/unityPlatform.h b/open-vm-tools/services/plugins/unity/unitylib/unityPlatform.h
index 192676bb6..0f1f984d7 100644
--- a/open-vm-tools/services/plugins/unity/unitylib/unityPlatform.h
+++ b/open-vm-tools/services/plugins/unity/unitylib/unityPlatform.h
@@ -134,15 +134,6 @@ Bool UnityPlatformSendMouseWheel(UnityPlatform *up,
                                  int32 deltaY,
                                  int32 deltaZ,
                                  uint32 modifierFlags);
-
-/*
- * Function called by UnityUpdateCallbackFn whenever a window is removed from
- * the tracker.
- *
- * NOTE: This function is called with the platform lock held.
- */
-void UnityPlatformWillRemoveWindow(UnityPlatform *up, UnityWindowId windowId);
-
 void UnityPlatformSetDisableCompositing(UnityPlatform *up, Bool disabled);
 
 #ifdef __cplusplus
diff --git a/open-vm-tools/services/plugins/unity/unitylib/unityPlatformX11.c b/open-vm-tools/services/plugins/unity/unitylib/unityPlatformX11.c
index 8a90bb4a1..d065390a1 100644
--- a/open-vm-tools/services/plugins/unity/unitylib/unityPlatformX11.c
+++ b/open-vm-tools/services/plugins/unity/unitylib/unityPlatformX11.c
@@ -3148,31 +3148,6 @@ void UnityPlatformSetInterlockMinimizeOperation(UnityPlatform *up,   // IN
 }
 
 
-/*
- *------------------------------------------------------------------------------
- *
- * UnityPlatformWillRemoveWindow --
- *
- *    Called when a window is removed from the UnityWindowTracker.
- *
- *    NOTE: This function is called with the platform lock held.
- *
- * Results:
- *    None.
- *
- * Side effects:
- *    None.
- *------------------------------------------------------------------------------
- */
-
-void
-UnityPlatformWillRemoveWindow(UnityPlatform *up,      // IN
-                              UnityWindowId windowId) // IN
-{
-   ASSERT(up);
-}
-
-
 /*
  *-----------------------------------------------------------------------------
  *