From ed69dff3805912007dfa783df027f93c952a12b3 Mon Sep 17 00:00:00 2001 From: dteske Date: Wed, 19 Jun 2013 00:09:21 +0000 Subject: Take advantage of newly updated f_dialog_{yesno,noyes}() functions from SVN r251977 (adding an $hline parameter). --- usr.sbin/bsdconfig/timezone/timezone | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/bsdconfig/timezone/timezone b/usr.sbin/bsdconfig/timezone/timezone index 224c143..e9112f5 100755 --- a/usr.sbin/bsdconfig/timezone/timezone +++ b/usr.sbin/bsdconfig/timezone/timezone @@ -244,29 +244,11 @@ if [ $# -ge 1 ]; then default="$1" f_dialog_title "$msg_default_zone_provided" - title="$DIALOG_TITLE" - btitle="$DIALOG_BACKTITLE" - f_dialog_title_restore msg=$( printf "\n$msg_use_default_zone" "$default" ) - f_dialog_buttonbox_size height width "$title" "$btitle" "$msg" - - if [ "$USE_XDIALOG" ]; then - eval $DIALOG \ - --title \"\$title\" \ - --backtitle \"\$btitle\" \ - --ok-label \"\$msg_yes\" \ - --cancel-label \"\$msg_no\" \ - --yesno \"\$msg\" $height $width - result=$? - else - eval $DIALOG \ - --title \"\$title\" \ - --backtitle \"\$btitle\" \ - --yes-label \"\$msg_yes\" \ - --no-label \"\$msg_no\" \ - --yesno \"\$msg\" $height $width - result=$? - fi + hline= + f_dialog_yesno "$msg" "$hline" + result=$? + f_dialog_title_restore if [ $result -eq 0 ]; then # User chose YES -- cgit v1.1