AppMenu GTK+

Merge lp:~ken-vandine/appmenu-gtk/lp674047 into lp:appmenu-gtk/0.4

  1. lp674047
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Merged at revision: 116
Proposed branch: lp:~ken-vandine/appmenu-gtk/lp674047
Merge into: lp:appmenu-gtk/0.4
Diff against target: 23 lines (+7/-1)
2 files modified
80appmenu.in (+4/-1)
Makefile.am (+3/-0)
To merge this branch: bzr merge lp:~ken-vandine/appmenu-gtk/lp674047
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Cody Russell (community) Approve
Review via email: mp+49641@code.launchpad.net

Description of the change

Check for existance of the menuproxy module before exporting the UBUNTU_MENUPROXY variable

To post a comment you must log in.
Revision history for this message
Cody Russell (bratsche) :
review: Approve
Revision history for this message
Ted Gould (ted) wrote :

  review approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file '80appmenu' => '80appmenu.in'
2--- 80appmenu 2010-07-19 15:27:26 +0000
3+++ 80appmenu.in 2011-02-14 15:06:16 +0000
4@@ -1,1 +1,4 @@
5-export UBUNTU_MENUPROXY="libappmenu.so"
6+if [ -f @libdir@/gtk-2.0/2.10.0/menuproxies/libappmenu.so ]
7+then
8+ export UBUNTU_MENUPROXY="libappmenu.so"
9+fi
10
11=== modified file 'Makefile.am'
12--- Makefile.am 2010-06-11 16:22:18 +0000
13+++ Makefile.am 2011-02-14 15:06:16 +0000
14@@ -8,6 +8,9 @@
15 build \
16 src
17
18+80appmenu: 80appmenu.in
19+ sed -e "s|\@libdir\@|$(libdir)|" $< > $@
20+
21 xsessiondir = $(sysconfdir)/X11/Xsession.d
22
23 xsession_DATA = 80appmenu

Subscribers

People subscribed via source and target branches