Change to common source files not applicable to open-vm-tools.

diff --git a/open-vm-tools/lib/include/conf.h b/open-vm-tools/lib/include/conf.h
index fc3763dc1a95071efbd5e0815e92daa15875e914..d7510d6c6e71c0e6863e8e0146bd385f4b40ca9a 100644 (file)
--- a/open-vm-tools/lib/include/conf.h
+++ b/open-vm-tools/lib/include/conf.h
@@ -519,44 +519,6 @@
  */
 
 
-/*
- ******************************************************************************
- * BEGIN Unity goodies.
- */
-
-/**
- * Defines the string used for the Unity config file group.
- */
-#define CONFGROUPNAME_UNITY "unity"
-
-/**
- * Lets users override system decisions about whether unity should be available.
- */
-#define CONFNAME_UNITY_FORCEENABLE "forceEnable"
-
-/**
- * Lets users override the desktop background color when in Unity mode.
- */
-#define CONFNAME_UNITY_BACKGROUNDCOLOR "desktop.backgroundColor"
-
-/**
- * Lets users enable (or disable) the Protocol Buffer enabled service
- */
-#define CONFNAME_UNITY_ENABLEPBRPC "pbrpc.enable"
-
-/**
- * Lets users configure the socket type for the PBRPC Services
- */
-#define CONFNAME_UNITY_PBRPCSOCKETTYPE "pbrpc.socketType"
-#define CONFNAME_UNITY_PBRPCSOCKETTYPE_IPSOCKET "ipsocket"
-#define CONFNAME_UNITY_PBRPCSOCKETTYPE_VSOCKET "vsocket"
-
-/*
- * END Unity goodies.
- ******************************************************************************
- */
-
-
 /*
  ******************************************************************************
  * BEGIN deployPkg goodies.
@@ -602,13 +564,6 @@
 
 #   define CONF_VMWARE_TOOLS_REGKEY_W WSTR(CONF_VMWARE_TOOLS_REGKEY)
 #   define CONF_VMWARE_TOOLS_INSTPATH_KEY_W WSTR(CONF_VMWARE_TOOLS_INSTPATH_KEY)
-#   ifdef UNITY_FOR_VIEW
-#      define CONF_VMWARE_RDE_REGKEY  "SOFTWARE\\VMware, Inc.\\VMware VDM\\RemoteExperienceAgent"
-#      define CONF_VMWARE_RDE_INSTPATH_KEY "InstallPath"
-
-#      define CONF_VMWARE_RDE_REGKEY_W WSTR(CONF_VMWARE_RDE_REGKEY)
-#      define CONF_VMWARE_RDE_INSTPATH_KEY_W WSTR(CONF_VMWARE_RDE_INSTPATH_KEY)
-#   endif
 #endif
 
 /* Wait 5 seconds between polls to see if the conf file has changed */

diff --git a/open-vm-tools/lib/include/vmware/tools/log.h b/open-vm-tools/lib/include/vmware/tools/log.h
index 5e566945510e8c8220b4ac36532692cbb14bebfb..f87658dfcbf235d201a4de9c4ebfc83bb03b4cd7 100644 (file)
--- a/open-vm-tools/lib/include/vmware/tools/log.h
+++ b/open-vm-tools/lib/include/vmware/tools/log.h
@@ -114,11 +114,6 @@
  * vmsvc.level = info
  * vmsvc.handler = std
  *
- * # Defines the "unity" domain, logging to a file.
- * unity.level = warning
- * unity.handler = file
- * unity.data = /tmp/unity.log
- *
  * # Defines the "vmtoolsd" domain, and disable logging for it.
  * vmtoolsd.level = none
  * @endverbatim

diff --git a/open-vm-tools/tools.conf b/open-vm-tools/tools.conf
index 7c79c7911a8744d1fa76f2f89594ec70349e92fa..956ad281018f7eeb19f3188dcfdff0450d23dac4 100644 (file)
--- a/open-vm-tools/tools.conf
+++ b/open-vm-tools/tools.conf
@@ -336,20 +336,6 @@
 # Set to true to deactivate the servicediscovery plugin.
 #disabled=false
 
-[unity]
-#
-# Unity is available for Windows only.
-#
-
-# Set to true to override system decisions about whether unity should be available.
-#forceEnable=false
-
-# Override the desktop background color when in Unity mode.
-#desktop.backgroundColor=
-
-# The socket type can be 'ipsocket' or 'vsocket':
-#pbrpc.socketType
-
 [resolutionKMS]
 
 # Default is true if tools finds an xf86-video-vmware driver with