From 7cc05b89cbe71455d5ea3859341908b3af451baa Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Sat, 28 Feb 2009 15:35:15 +0100
Subject: ask_option fixes

---
 src/core/libs/lib-ui.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/core')

diff --git a/src/core/libs/lib-ui.sh b/src/core/libs/lib-ui.sh
index 1724ed1..5955334 100644
--- a/src/core/libs/lib-ui.sh
+++ b/src/core/libs/lib-ui.sh
@@ -359,13 +359,13 @@ _dia_ask_option ()
  	DIA_MENU_TITLE=$2
 	EXTRA_INFO=$3
 	shift 4
-	CANCEL_LABEL=
-	[ $TYPE == optional ] && CANCEL_LABEL='--cancel-label "Skip"'
-	_dia_DIALOG $DEFAULT $CANCEL_LABEL --colors --title " $DIA_MENU_TITLE " --menu "$DIA_MENU_TEXT $EXTRA_INFO" 20 80 16 "$@" 2>$ANSWER
+	CANCEL_LABEL=Cancel
+	[ $TYPE == optional ] && CANCEL_LABEL='Skip'
+	_dia_DIALOG $DEFAULT --cancel-label $CANCEL_LABEL --colors --title " $DIA_MENU_TITLE " --menu "$DIA_MENU_TEXT $EXTRA_INFO" 20 80 16 "$@" 2>$ANSWER
 	ret=$?
 	ANSWER_OPTION=`cat $ANSWER`
 	debug 'UI' "dia_ask_option: User choose $ANSWER_OPTION ($DIA_MENU_TITLE)"
-	[ $type == required ] && return $ret
+	[ $TYPE == required ] && return $ret
 	return 0 # TODO: check if dialog returned >0 because of an other reason then the user hitting 'cancel/skip'
 }
 
-- 
cgit v1.2.3-54-g00ecf