--- pinentry-wrapper~ 2014-12-02 16:14:26.216000000 +0300 +++ pinentry-wrapper 2014-12-02 16:16:42.720000000 +0300 @@ -40,14 +40,15 @@ elif [ -n "$KDE_FULL_SESSION" ]; then fi # Check for presence of xprop binary +XPROP=xprop type xprop >/dev/null 2>/dev/null -XPROP=$? +[ $? -eq 0 ] || XPROP= -if [ -n "$DISPLAY" -a $XPROP -eq 0 ]; then - xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null +if [ -n "$DISPLAY" -a -n "$XPROP" ]; then + $XPROP -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null if test $? -eq 0; then kde_running=1 - kde_ver="`xprop -root | sed -n 's/KDE_SESSION_VERSION(CARDINAL) = //p'`" 2>/dev/null + kde_ver="`$XPROP -root | sed -n 's/KDE_SESSION_VERSION(CARDINAL) = //p'`" 2>/dev/null fi fi