02/02: installer: Handle buttons better.

[Danny Milosavljevic]

dannym pushed a commit to branch wip-installer-2
in repository guix.

commit 313f635064fdfcf3244863f677a8128f5fc2366a
Author: Danny Milosavljevic <address@hidden>
Date:   Fri Jul 7 17:11:16 2017 +0200

    installer: Handle buttons better.
    
    * gnu/system/installer/page.scm (page-default-key-handler): Handle buttons
    better.
    * gnu/system/installer/wireless.scm (wireless-page-activate-item): Revert.
---
 gnu/system/installer/page.scm     | 4 +++-
 gnu/system/installer/wireless.scm | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/system/installer/page.scm b/gnu/system/installer/page.scm
index 2572591..d435455 100644
--- a/gnu/system/installer/page.scm
+++ b/gnu/system/installer/page.scm
@@ -144,7 +144,9 @@ If a form is used it's assumed that the menu is not used 
and vice versa."
                           (if (and menu (menu-active menu))
                             (list 'menu-item-activated
                                   (menu-get-current-item menu))
-                            'default)))
+                            (if nav
+                              (buttons-selected-symbol nav)
+                              'default))))
 
      ((and menu (menu-active menu) (std-menu-key-handler menu ch))
       'handled)
diff --git a/gnu/system/installer/wireless.scm 
b/gnu/system/installer/wireless.scm
index 113b89c..c9fa53c 100644
--- a/gnu/system/installer/wireless.scm
+++ b/gnu/system/installer/wireless.scm
@@ -70,9 +70,6 @@
    ('cancel
     (page-leave)
     'handled)
-   ('default
-    (page-leave)
-    'handled)
    (_
     'ignored)))