]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commit
GHI/X11: Move "DetectDesktopEnv" to lib/xdg.
authorVMware, Inc <>
Thu, 18 Nov 2010 22:03:34 +0000 (14:03 -0800)
committerMarcelo Vanzin <mvanzin@vmware.com>
Thu, 18 Nov 2010 22:03:34 +0000 (14:03 -0800)
commitca030dffff3c226ddefc40e6b0e2a7e18cc6f6de
tree53383a7917bd8b571e77323e7665bd2aad183f33
parent31fb0d37b4826ff7dbd89aad6e054c7e1860a7a4
GHI/X11: Move "DetectDesktopEnv" to lib/xdg.

This takes the static deskeop environment detection logic out of lib/
ghIntegration and places it a shell script and wrapper in lib/xdg.
We'll now distribute with Tools a vmware-xdg-detect-de which contains
the "detectDE" routine used in many of Portland's xdg-* scripts.

Keeping this logic in a script has a few motivations:
1.  No D-Bus (or similar) dependency added to library code.
2.  Allows users to hack as time goes on in case any of the methods
currently employed stop working.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
open-vm-tools/configure.ac
open-vm-tools/lib/Makefile.am
open-vm-tools/lib/include/xdg.h [moved from open-vm-tools/services/plugins/unity/ghIntegration/ghiX11.h with 84% similarity]
open-vm-tools/lib/xdg/Makefile.am [new file with mode: 0644]
open-vm-tools/lib/xdg/xdg.c [new file with mode: 0644]
open-vm-tools/scripts/common/vmware-xdg-detect-de [new file with mode: 0644]
open-vm-tools/services/plugins/unity/Makefile.am
open-vm-tools/services/plugins/unity/ghIntegration/icon.cc
open-vm-tools/services/plugins/unity/ghIntegration/platform.cc
open-vm-tools/toolbox/Makefile.am