2015-02-02 13:55:23 +00:00
committed by Git OBS Bridge
parent e231041bee
commit f1c7b97bbc
4 changed files with 26 additions and 10 deletions

View File

@@ -41,12 +41,18 @@
# Checks for known desktop environments
# set variable DE to the desktop environments name, lowercase
DE=generic
detectDE()
{
if test "$KDE_FULL_SESSION" = "true" ; then DE=kde;
elif test -n "$GNOME_DESKTOP_SESSION_ID" ; then DE=gnome;
elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' &>/dev/null ; then DE=xfce;
fi
case "$DE" in
kde) ;;
gnome) type -p kioclient &>/dev/null || DE=generic ;;
xfce) type -p exo-open &>/dev/null || DE=generic ;;
esac
}
#----------------------------------------------------------------------------
@@ -69,26 +75,30 @@ kfmclient_fix_exit_code()
open_kde()
{
kfmclient exec "$1"
kfmclient_fix_exit_code $?
if type -p kioclient &>/dev/null ; then
kioclient exec ${1+"$@"}
else
kfmclient exec ${1+"$@"}
kfmclient_fix_exit_code $?
fi
test $? -eq 0 || exit 1
}
open_gnome()
{
gnome-open "$1"
gnome-open ${1+"$@"}
test $? -eq 0 || exit 1
}
open_xfce()
{
exo-open "$1"
exo-open ${1+"$@"}
test $? -eq 0 || exit 1
}
open_generic()
{
gv -antialias ${1+"$@"}
gv ${1+"$@"}
test $? -eq 0 || exit 1
}
@@ -98,8 +108,8 @@ GS_DEVICE=x11alpha
GS_OPTIONS=-dNOPLATFONTS
export GS_DEVICE GS_OPTIONS
case "$DE" in
# kde) open_kde ${1+"$@"} ;;
# gnome) open_gnome ${1+"$@"} ;;
# xfce) open_xfce ${1+"$@"} ;;
kde) open_kde ${1+"$@"} ;;
gnome) open_gnome ${1+"$@"} ;;
xfce) open_xfce ${1+"$@"} ;;
*) open_generic ${1+"$@"}
esac