Author: mvidner Date: Tue Aug 19 15:55:52 2008 New Revision: 50203 URL: http://svn.opensuse.org/viewcvs/yast?rev=50203&view=rev Log: Use zenity or kdialog instead of xmessage if available, for accessibility (bnc#418032, bnc#343903). Modified: trunk/yast2/package/yast2.changes trunk/yast2/scripts/yast2 Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=50203&r1=50202&r2=50203&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Aug 19 15:55:52 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 19 15:55:31 CEST 2008 - mvidner@suse.cz + +- Use zenity or kdialog instead of xmessage if available, for + accessibility (bnc#418032, bnc#343903). + +------------------------------------------------------------------- Mon Aug 18 13:05:54 CEST 2008 - jsrain@suse.cz - fixed bash completion (bnc #417755) Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=50203&r1=50202&r2=50203&view=diff ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Tue Aug 19 15:55:52 2008 @@ -40,6 +40,18 @@ fi } +# $1: file with error message +display_error_file() +{ + if [ -x /usr/bin/zenity ]; then + /usr/bin/zenity --title="Error" --text-info --filename="$1" + elif [ -x /usr/bin/kdialog ]; then + /usr/bin/kdialog --title "Error" --textbox "$1" + else + xmessage -buttons OK:0 -default OK -center -file "$1" + fi +} + exit_code=0 exit_trap() @@ -47,7 +59,7 @@ # handily, exit_code is set to $? of y2base. # If there was an error and there is anything to display, pop up. if [ $exit_code != 0 -a -s $ERRLOG ]; then - xmessage -buttons OK:0 -default OK -center -file $ERRLOG + display_error_file $ERRLOG fi rm -f $ERRLOG } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org