ayatana-commits team mailing list archive

[Ken VanDine <ken.vandine@xxxxxxxxxxxxx>]

Ken VanDine has proposed merging lp:~ken-vandine/appmenu-gtk/lp674047 into lp:appmenu-gtk.

Requested reviews:
  Canonical Desktop Experience Team (canonical-dx-team)
Related bugs:
  #674047 the xsession script should set the variable only if the needed file is installed
  https://bugs.launchpad.net/bugs/674047

For more details, see:
https://code.launchpad.net/~ken-vandine/appmenu-gtk/lp674047/+merge/49641

Check for existance of the menuproxy module before exporting the UBUNTU_MENUPROXY variable
-- 
https://code.launchpad.net/~ken-vandine/appmenu-gtk/lp674047/+merge/49641
Your team ayatana-commits is subscribed to branch lp:appmenu-gtk.

=== renamed file '80appmenu' => '80appmenu.in'
--- 80appmenu	2010-07-19 15:27:26 +0000
+++ 80appmenu.in	2011-02-14 15:06:16 +0000
@@ -1,1 +1,4 @@
-export UBUNTU_MENUPROXY="libappmenu.so"
+if [ -f @libdir@/gtk-2.0/2.10.0/menuproxies/libappmenu.so ]
+then
+	export UBUNTU_MENUPROXY="libappmenu.so"
+fi

=== modified file 'Makefile.am'
--- Makefile.am	2010-06-11 16:22:18 +0000
+++ Makefile.am	2011-02-14 15:06:16 +0000
@@ -8,6 +8,9 @@
 	build		\
 	src
 
+80appmenu: 80appmenu.in
+	sed -e "s|\@libdir\@|$(libdir)|" $< > $@
+
 xsessiondir = $(sysconfdir)/X11/Xsession.d
 
 xsession_DATA = 80appmenu