]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commitdiff
unity: Remove UnityPlatformWillRemoveWindow().
authorVMware, Inc <>
Tue, 19 Oct 2010 20:06:19 +0000 (13:06 -0700)
committerMarcelo Vanzin <mvanzin@vmware.com>
Tue, 19 Oct 2010 20:06:19 +0000 (13:06 -0700)
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>
open-vm-tools/services/plugins/unity/unitylib/unity.c
open-vm-tools/services/plugins/unity/unitylib/unityPlatform.h
open-vm-tools/services/plugins/unity/unitylib/unityPlatformX11.c

index 3f50b7ac3b18b0fb74ab56ea85f7a9ef850934f1..177b718279d8aae8ae7d9dc8661d0cf3f5c2f46f 100644 (file)
@@ -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);
 }
 
index 192676bb6da4214b740e25367872ffc57551dfe9..0f1f984d78395d9d6603ef9c7fa15684d01042d8 100644 (file)
@@ -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
index 8a90bb4a1accc63ad46cb0f4e4ac3d517175f91b..d065390a1b4e6d1b10d87c39bb2497444c4e997e 100644 (file)
@@ -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);
-}
-
-
 /*
  *-----------------------------------------------------------------------------
  *