From: VMware, Inc <>
Date: Sat, 28 May 2011 19:39:35 +0000 (-0700)
Subject: unity: remove references to the old "guest dict".
X-Git-Tag: 2011.05.27-420096~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be82d2dca696c48958cba04f54181d40aa47a9e9;p=thirdparty%2Fopen-vm-tools.git

unity: remove references to the old "guest dict".

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

diff --git a/open-vm-tools/services/plugins/unity/unityPlugin.cpp b/open-vm-tools/services/plugins/unity/unityPlugin.cpp
index af47d36ae..8a5055503 100644
--- a/open-vm-tools/services/plugins/unity/unityPlugin.cpp
+++ b/open-vm-tools/services/plugins/unity/unityPlugin.cpp
@@ -127,7 +127,7 @@ UnityPlugin::Initialize(ToolsAppCtx *ctx)       // IN: Host application context.
    }
    unityHostCallbacks.updateCbCtx = mUnityUpdateChannel;
 
-   Unity_Init(NULL, unityHostCallbacks, ctx->serviceObj);
+   Unity_Init(unityHostCallbacks, ctx->serviceObj);
 
    GHITcloInit();
    GHIHostCallbacks ghiHostCallbacks;
diff --git a/open-vm-tools/services/plugins/unity/unitylib/unity.c b/open-vm-tools/services/plugins/unity/unitylib/unity.c
index 6f2ef74ea..a3dcb2403 100644
--- a/open-vm-tools/services/plugins/unity/unitylib/unity.c
+++ b/open-vm-tools/services/plugins/unity/unitylib/unity.c
@@ -202,8 +202,7 @@ Unity_IsActive(void)
  */
 
 void
-Unity_Init(GuestApp_Dict *conf,                                    // IN
-           UnityHostCallbacks hostCallbacks,                       // IN
+Unity_Init(UnityHostCallbacks hostCallbacks,                       // IN
            gpointer serviceObj)                                    // IN
 {
    Debug("Unity_Init\n");
diff --git a/open-vm-tools/services/plugins/unity/unitylib/unity.h b/open-vm-tools/services/plugins/unity/unitylib/unity.h
index da0d1ce87..26c6f0585 100644
--- a/open-vm-tools/services/plugins/unity/unitylib/unity.h
+++ b/open-vm-tools/services/plugins/unity/unitylib/unity.h
@@ -29,7 +29,6 @@
 #include <string.h>
 #include "dndGuest.h"
 #include "dbllnklst.h"
-#include "guestApp.h"
 #include "dynbuf.h"
 #include "str.h"
 #ifdef _WIN32
@@ -150,8 +149,7 @@ typedef struct UnityHostCallbacks {
 extern "C" {
 #endif // __cplusplus
 
-void Unity_Init(GuestApp_Dict *conf,
-                UnityHostCallbacks hostCallbacks,
+void Unity_Init(UnityHostCallbacks hostCallbacks,
                 gpointer serviceObj);
 Bool Unity_IsActive(void);
 Bool Unity_IsSupported(void);