From: VMware, Inc <>
Date: Mon, 20 Sep 2010 18:11:52 +0000 (-0700)
Subject: ghIntegration: introduce internal gnome-menus-2.30.2.
X-Git-Tag: 2010.09.19-301124~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1dfbf49d2fcdbc6501fb357968097c0011a9a35e;p=thirdparty%2Fopen-vm-tools.git

ghIntegration: introduce internal gnome-menus-2.30.2.

Includes our hacked <gnome-menus/gmenu-tree.h> in ghIntegrationX11.c, guarded
by REDIST_GMENU macro.

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

diff --git a/open-vm-tools/services/plugins/unity/ghIntegration/ghIntegrationX11.c b/open-vm-tools/services/plugins/unity/ghIntegration/ghIntegrationX11.c
index 75ed2e234..8e1fe42e6 100644
--- a/open-vm-tools/services/plugins/unity/ghIntegration/ghIntegrationX11.c
+++ b/open-vm-tools/services/plugins/unity/ghIntegration/ghIntegrationX11.c
@@ -49,6 +49,12 @@
 #include <gdk/gdkx.h>
 #undef Bool
 
+/* And this is why we have to ship and link against our own. */
+#ifdef REDIST_GMENU
+#define GMENU_I_KNOW_THIS_IS_UNSTABLE
+#include <gnome-menus/gmenu-tree.h>
+#endif
+
 #include "vmware.h"
 #include "vmware/tools/guestrpc.h"
 #include "base64.h"