From owner-svn-src-head@FreeBSD.ORG Wed Jun 19 00:09:21 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 82EC4211; Wed, 19 Jun 2013 00:09:21 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 75ABC1C0F; Wed, 19 Jun 2013 00:09:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5J09LiO072954; Wed, 19 Jun 2013 00:09:21 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5J09LkF072953; Wed, 19 Jun 2013 00:09:21 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201306190009.r5J09LkF072953@svn.freebsd.org> From: Devin Teske Date: Wed, 19 Jun 2013 00:09:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251979 - head/usr.sbin/bsdconfig/timezone X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jun 2013 00:09:21 -0000 Author: dteske Date: Wed Jun 19 00:09:21 2013 New Revision: 251979 URL: http://svnweb.freebsd.org/changeset/base/251979 Log: Take advantage of newly updated f_dialog_{yesno,noyes}() functions from SVN r251977 (adding an $hline parameter). Modified: head/usr.sbin/bsdconfig/timezone/timezone Modified: head/usr.sbin/bsdconfig/timezone/timezone ============================================================================== --- head/usr.sbin/bsdconfig/timezone/timezone Wed Jun 19 00:08:29 2013 (r251978) +++ head/usr.sbin/bsdconfig/timezone/timezone Wed Jun 19 00:09:21 2013 (r251979) @@ -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