[Xfce4-commits] <xfce-utils:master> Only set XDG_MENU_PREFIX if it's empty.

[Jannis Pohlmann]

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

commit f21ca48e5fa7b0386a524de6e9ced69c813c5f22
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sat Dec 4 13:28:59 2010 +0100

    Only set XDG_MENU_PREFIX if it's empty.
    
    AFAIK, there is no way to check whether the variable has been defined
    before. We only have the is-it-empty check. This makes it impossible
    to set XDG_MENU_PREFIX="" to override the "xfce-" prefix... perhaps
    someone knows a way?

 scripts/xinitrc.in.in |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
index b4d2cd5..3004743 100755
--- a/scripts/xinitrc.in.in
+++ b/scripts/xinitrc.in.in
@@ -11,8 +11,10 @@ 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
+if test "x$XDG_MENU_PREFIX" = "x"; then
+  XDG_MENU_PREFIX="xfce-"
+  export XDG_MENU_PREFIX
+fi
 
 # $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