jmd pushed a commit to branch wip-installer in repository guix. commit 63b54ec2ef0d6bd9ef47218d5c2a78c48641e412 Author: John Darrington <j...@gnu.org> Date: Fri Jan 6 20:04:57 2017 +0100
installer: Remove pointless calls to delwin. This gets called anyway when the window is garbage collected. * gnu/system/installer/configure.scm: Remove delwin call. * gnu/system/installer/dialog.scm: Remove delwin call. * gnu/system/installer/disks.scm: Remove delwin call. * gnu/system/installer/file-browser.scm: Remove delwin call. * gnu/system/installer/filesystems.scm: Remove delwin call. * gnu/system/installer/install.scm: Remove delwin call. * gnu/system/installer/network.scm: Remove delwin call. * gnu/system/installer/ping.scm: Remove delwin call. * gnu/system/installer/role.scm: Remove delwin call. * gnu/system/installer/time-zone.scm: Remove delwin call. --- gnu/system/installer/configure.scm | 4 ---- gnu/system/installer/dialog.scm | 2 -- gnu/system/installer/disks.scm | 1 - gnu/system/installer/file-browser.scm | 2 -- gnu/system/installer/filesystems.scm | 3 --- gnu/system/installer/install.scm | 2 -- gnu/system/installer/network.scm | 2 -- gnu/system/installer/ping.scm | 2 -- gnu/system/installer/role.scm | 4 ---- gnu/system/installer/time-zone.scm | 2 -- 10 files changed, 24 deletions(-) diff --git a/gnu/system/installer/configure.scm b/gnu/system/installer/configure.scm index f0206a3..d454488 100644 --- a/gnu/system/installer/configure.scm +++ b/gnu/system/installer/configure.scm @@ -97,8 +97,6 @@ ((buttons-key-matches-symbol? nav ch 'back) ;; Close the menu and return - (delwin (outer (page-wwin page))) - (delwin (inner (page-wwin page))) (set! page-stack (cdr page-stack))) @@ -113,8 +111,6 @@ (close-port cfg-port)) ;; Close the menu and return - (delwin (outer (page-wwin page))) - (delwin (inner (page-wwin page))) (set! page-stack (cdr page-stack))) ) diff --git a/gnu/system/installer/dialog.scm b/gnu/system/installer/dialog.scm index 26064eb..2c8f3ed 100644 --- a/gnu/system/installer/dialog.scm +++ b/gnu/system/installer/dialog.scm @@ -52,8 +52,6 @@ (buttons-select-next nav)))) ((buttons-key-matches-symbol? nav ch 'ok) - (delwin (outer (page-wwin page))) - (delwin (inner (page-wwin page))) (delwin (page-datum page 'text-window)) (set! page-stack (cdr page-stack)) diff --git a/gnu/system/installer/disks.scm b/gnu/system/installer/disks.scm index f0f043a..9a1c8b6 100644 --- a/gnu/system/installer/disks.scm +++ b/gnu/system/installer/disks.scm @@ -94,7 +94,6 @@ (system* "partprobe"))) ((buttons-key-matches-symbol? nav ch 'continue) - (delwin (outer (page-wwin page))) (set! page-stack (cdr page-stack)) ((page-refresh (car page-stack)) (car page-stack)))) diff --git a/gnu/system/installer/file-browser.scm b/gnu/system/installer/file-browser.scm index 35c54cb..70fcae3 100644 --- a/gnu/system/installer/file-browser.scm +++ b/gnu/system/installer/file-browser.scm @@ -55,8 +55,6 @@ (buttons-select-next nav)))) ((buttons-key-matches-symbol? nav ch 'back) - (delwin (outer (page-wwin page))) - (delwin (inner (page-wwin page))) (set! page-stack (cdr page-stack))) diff --git a/gnu/system/installer/filesystems.scm b/gnu/system/installer/filesystems.scm index bde276d..0908f52 100644 --- a/gnu/system/installer/filesystems.scm +++ b/gnu/system/installer/filesystems.scm @@ -188,8 +188,6 @@ )) ((buttons-key-matches-symbol? nav ch 'back) - (delwin (outer (page-wwin page))) - (delwin (inner (page-wwin page))) (set! page-stack (cdr page-stack))) @@ -200,7 +198,6 @@ (set! page-stack (cons next page-stack)) ((page-refresh next) next)) (begin - (delwin (outer (page-wwin page))) (set! page-stack (cdr page-stack)) ((page-refresh (car page-stack)) (car page-stack))) )))) diff --git a/gnu/system/installer/install.scm b/gnu/system/installer/install.scm index 5cfb52e..a08b4f8 100644 --- a/gnu/system/installer/install.scm +++ b/gnu/system/installer/install.scm @@ -70,8 +70,6 @@ ((buttons-key-matches-symbol? nav ch 'back) ;; Close the menu and return - (delwin (outer (page-wwin page))) - (delwin (inner (page-wwin page))) (set! page-stack (cdr page-stack))) ((buttons-key-matches-symbol? nav ch 'reboot) diff --git a/gnu/system/installer/network.scm b/gnu/system/installer/network.scm index 45e6981..7eb4807 100644 --- a/gnu/system/installer/network.scm +++ b/gnu/system/installer/network.scm @@ -116,8 +116,6 @@ ;; Cancel the timer (setitimer ITIMER_REAL 0 0 0 0) - (delwin (outer (page-wwin page))) - (delwin (inner (page-wwin page))) (set! page-stack (cdr page-stack)))) (std-menu-key-handler menu ch)) diff --git a/gnu/system/installer/ping.scm b/gnu/system/installer/ping.scm index 5f117bc..1afb2cf 100644 --- a/gnu/system/installer/ping.scm +++ b/gnu/system/installer/ping.scm @@ -72,8 +72,6 @@ (buttons-unselect-all nav)) ((buttons-key-matches-symbol? nav ch 'continue) - (delwin (outer (page-wwin page))) - (delwin (inner (page-wwin page))) (delwin (page-datum page 'test-window)) (set! page-stack (cdr page-stack)) diff --git a/gnu/system/installer/role.scm b/gnu/system/installer/role.scm index 840d0cf..369f695 100644 --- a/gnu/system/installer/role.scm +++ b/gnu/system/installer/role.scm @@ -88,13 +88,9 @@ ((select-key? ch) (set! system-role (menu-get-current-item menu)) - (delwin (outer (page-wwin page))) - (delwin (inner (page-wwin page))) (set! page-stack (cdr page-stack))) ((buttons-key-matches-symbol? nav ch 'back) - (delwin (outer (page-wwin page))) - (delwin (inner (page-wwin page))) (set! page-stack (cdr page-stack)))) (std-menu-key-handler menu ch)) diff --git a/gnu/system/installer/time-zone.scm b/gnu/system/installer/time-zone.scm index f8876f8..416067f 100644 --- a/gnu/system/installer/time-zone.scm +++ b/gnu/system/installer/time-zone.scm @@ -55,8 +55,6 @@ (buttons-select-next nav)))) ((buttons-key-matches-symbol? nav ch 'back) - (delwin (outer (page-wwin page))) - (delwin (inner (page-wwin page))) (set! page-stack (cdr page-stack)))