[Xfce4-commits] <xfce-utils:master> Set XDG_MENU_PREFIX to "xfce-" and export it (bug #5980).

[Jannis Pohlmann]

Updating branch refs/heads/master
         to f9e552c4b599949425978e176e5b7222c985fe64 (commit)
       from c102297da49a821158935d3f51146410be917644 (commit)

commit f9e552c4b599949425978e176e5b7222c985fe64
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sat Dec 4 12:41:09 2010 +0100

    Set XDG_MENU_PREFIX to "xfce-" and export it (bug #5980).

 NEWS                  |    6 ++++++
 scripts/xinitrc.in.in |    5 +++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/NEWS b/NEWS
index 9a2e989..276c5b4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+4.7.x
+=====
+- Set XDG_MENU_PREFIX to "xfce-" and export it (bug #5980).
+
+
 4.7.2
 =====
 - Return support for vendor information.
@@ -7,6 +12,7 @@
 - Translation updates (id, zh_TW, kk, it, fi, gl, da, ca, pt, uk,
   eu, sk, de, hu).
 
+
 4.7.1
 =====
 - Drop ck-launch-session as CK is handled in xfce4-session (bug #6684).
diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
index 45d0c93..b4d2cd5 100755
--- a/scripts/xinitrc.in.in
+++ b/scripts/xinitrc.in.in
@@ -9,6 +9,11 @@ if test "x$UID" = "x"; then
 	fi
 fi
 
+# set $XDG_MENU_PREFIX to "xfce-" so that "xfce-applications.menu" is picked
+# over "applications.menu" in all Xfce applications.
+XDG_MENU_PREFIX="xfce-"
+export XDG_MENU_PREFIX
+
 # $XDG_CONFIG_HOME defines the base directory relative to which user specific
 # configuration files should be stored. If $XDG_CONFIG_HOME is either not set
 # or empty, a default equal to $HOME/.config should be used.