[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
102/197: installer: Correct bug where the timezone page returned to the
From: |
Danny Milosavljevic |
Subject: |
102/197: installer: Correct bug where the timezone page returned to the wrong page. |
Date: |
Mon, 3 Jul 2017 20:37:08 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit a7ff5ad6c7f77dcab5d6aef6aee5417a9c392c39
Author: John Darrington <address@hidden>
Date: Sun Jan 15 16:30:49 2017 +0100
installer: Correct bug where the timezone page returned to the wrong page.
* gnu/system/installer/time-zone.scm (make-tz-page) : Remove exit-point
parameter.
* gnu/system/installer/guixsd-installer.scm (mount-options): Change call
to make-tz-page to match new signature.
---
gnu/system/installer/guixsd-installer.scm | 3 +--
gnu/system/installer/time-zone.scm | 12 +++++-------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/gnu/system/installer/guixsd-installer.scm
b/gnu/system/installer/guixsd-installer.scm
index 348e073..36fb6e5 100644
--- a/gnu/system/installer/guixsd-installer.scm
+++ b/gnu/system/installer/guixsd-installer.scm
@@ -116,8 +116,7 @@
(or
(getenv "TZDIR")
(string-append (car (slurp "guix build tzdata"
#f))
- "/share/zoneinfo"))
- page-stack))))
+ "/share/zoneinfo"))))))
(hostname . ,(make-task hostname-menu-title
'()
diff --git a/gnu/system/installer/time-zone.scm
b/gnu/system/installer/time-zone.scm
index ad62514..cdbd56d 100644
--- a/gnu/system/installer/time-zone.scm
+++ b/gnu/system/installer/time-zone.scm
@@ -32,16 +32,13 @@
str)))
-(define* (make-tz-browser parent directory #:optional (exit-point #f))
+(define (make-tz-browser parent directory)
(let ((page (make-page (page-surface parent)
(gettext "Time Zone")
time-zone-page-refresh
0
time-zone-page-key-handler)))
(page-set-datum! page 'directory directory)
- (if exit-point
- (page-set-datum! page 'exit-point exit-point)
- (page-set-datum! page 'exit-point (page-datum parent 'exit-point)))
page))
@@ -71,19 +68,20 @@
(st (lstat new-dir)))
(if (and (file-exists? new-dir)
(eq? 'directory (stat:type st)))
- (let ((p (make-tz-browser
- page new-dir)))
+ (let ((p (make-tz-browser page new-dir)))
(page-set-datum! p 'stem
(if (page-datum page 'stem)
(string-append (page-datum page 'stem) "/" i)
i))
+ ;; Don't go back to the current page!
+ (set! page-stack (cdr page-stack))
(page-enter p))
(begin
(set! time-zone
(if (page-datum page 'stem)
(string-append (page-datum page 'stem) "/" i)
i))
- (page-leave (page-datum page 'exit-point))
+ (page-leave)
#f)))
))
(std-menu-key-handler menu ch)
- 63/197: installer: Change essid --> wireless., (continued)
- 63/197: installer: Change essid --> wireless., Danny Milosavljevic, 2017/07/03
- 70/197: installer: Rename "file-browser" -> "time-zone"., Danny Milosavljevic, 2017/07/03
- 81/197: installer: Make all windows with ports scrollable., Danny Milosavljevic, 2017/07/03
- 62/197: installer: Add page with which the wifi password can be entered., Danny Milosavljevic, 2017/07/03
- 75/197: installer: Remove pointless calls to delwin., Danny Milosavljevic, 2017/07/03
- 87/197: installer: Minor cleanup., Danny Milosavljevic, 2017/07/03
- 79/197: installer: Rename "Back" buttons to "Cancel"., Danny Milosavljevic, 2017/07/03
- 98/197: installer: Correct bug detecting a wireless interface., Danny Milosavljevic, 2017/07/03
- 91/197: installer: Add callback parameter for forms., Danny Milosavljevic, 2017/07/03
- 95/197: installer: Add a predicate to ensure the partitions have been formatted., Danny Milosavljevic, 2017/07/03
- 102/197: installer: Correct bug where the timezone page returned to the wrong page.,
Danny Milosavljevic <=
- 119/197: gurses: Allow menu update to work for panel windows., Danny Milosavljevic, 2017/07/03
- 103/197: installer: Avoid exception when the device to format cannot be found., Danny Milosavljevic, 2017/07/03
- 116/197: installer: Fix bug in config generation., Danny Milosavljevic, 2017/07/03
- 105/197: installer: Extend the 'file-system' concept to include swap spaces., Danny Milosavljevic, 2017/07/03
- 83/197: installer: "Setup" --> "Set up", Danny Milosavljevic, 2017/07/03
- 92/197: installer: Remove mkfs capability from mount points page., Danny Milosavljevic, 2017/07/03
- 118/197: installer: Distinguish between Wifi encryption methods., Danny Milosavljevic, 2017/07/03
- 127/197: gurses: Remove box from form popup window., Danny Milosavljevic, 2017/07/03
- 123/197: installer: Add a popup window for forms which have multiple choice fields., Danny Milosavljevic, 2017/07/03
- 121/197: installer: Note which types of file system are supported., Danny Milosavljevic, 2017/07/03