gui: Don't show items in menus.

[gsu.git] / gui

diff --git a/gui b/gui
index 42975647e6900bb67c900c8108cc9925e4022739..72ddb28b2dd2b21655d834c0b3c193ad096d9d13 100644 (file)
--- a/gui
+++ b/gui
@@ -30,7 +30,7 @@ _set_dialog_ret()
 
        case "$ec" in
        0) ret=$GSU_SUCCESS;;
-       1) ret=1;; # cancelled
+       1|255) ret=1;; # cancelled
        *)
                result="dialog exit code $ec"
                ret=-$E_GSU_DIALOG
@@ -97,15 +97,13 @@ _gsu_menu()
 {
        local header="${1:-root}"
        local items="$2"
-       local i opts num=0
+       local geom
 
        _get_geometry
-       opts="$result 16"
-       for i in $items; do
-               let num++
-               opts+=" $i $num"
-       done
-       result="$(dialog --menu "$gsu_banner_txt ($header)" $opts 3>&1 1>&2 2>&3 3>&-)"
+       geom=$result
+       result="$(dialog --no-lines --no-items --menu \
+               "$gsu_banner_txt ($header)"  \
+               $geom 16 $items 3>&1 1>&2 2>&3 3>&-)"
        _set_dialog_ret $?
 }