guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

70/80: installer: Change essid --> wireless.


From: John Darrington
Subject: 70/80: installer: Change essid --> wireless.
Date: Tue, 3 Jan 2017 15:49:46 +0000 (UTC)

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

commit 64d8d8b4b8637ccae0dc3c21b99f3a4289d20f5d
Author: John Darrington <address@hidden>
Date:   Mon Jan 2 07:32:15 2017 +0100

    installer: Change essid --> wireless.
    
    * gnu/system/installer/network.scm: Change essid --> wireless.
    * gnu/system/installer/wireless.scm: Change essid --> wireless.
---
 gnu/system/installer/network.scm  |    2 +-
 gnu/system/installer/wireless.scm |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/system/installer/network.scm b/gnu/system/installer/network.scm
index 31f9dde..45e6981 100644
--- a/gnu/system/installer/network.scm
+++ b/gnu/system/installer/network.scm
@@ -91,7 +91,7 @@
      ((and (select-key? ch)
            (eq? 'wireless (assq-ref (menu-get-current-item menu) 'class)))
 
-      (let ((next (make-essid-page page (N_ "Wireless interface setup")
+      (let ((next (make-wireless-page page (N_ "Wireless interface setup")
                                    (assq-ref (menu-get-current-item menu) 
'name))))
         (set! page-stack (cons next page-stack))
         ((page-refresh next) next)))
diff --git a/gnu/system/installer/wireless.scm 
b/gnu/system/installer/wireless.scm
index a03715a..8615004 100644
--- a/gnu/system/installer/wireless.scm
+++ b/gnu/system/installer/wireless.scm
@@ -31,14 +31,14 @@
   #:use-module (guix utils)
 
   #:export (wireless-connect)
-  #:export (make-essid-page))
+  #:export (make-wireless-page))
 
 
-(define (make-essid-page parent title interface)
+(define (make-wireless-page parent title interface)
   (let ((page (make-page (page-surface parent)
                          title
-                         essid-page-refresh
-                         essid-page-key-handler)))
+                         wireless-page-refresh
+                         wireless-page-key-handler)))
 
     (page-set-datum! page 'ifce interface)
     page))
@@ -46,7 +46,7 @@
 
 (define my-buttons `((back ,(N_ "_Back") #t)))
 
-(define (essid-page-key-handler page ch)
+(define (wireless-page-key-handler page ch)
   (let ((nav  (page-datum page 'navigation))
         (menu  (page-datum page 'menu))
         (test-window  (page-datum page 'test-window)))
@@ -87,9 +87,9 @@
 
     #f))
 
-(define (essid-page-refresh page)
+(define (wireless-page-refresh page)
   (when (not (page-initialised? page))
-    (essid-page-init page)
+    (wireless-page-init page)
     (page-set-initialised! page #t))
   (touchwin (outer (page-wwin page)))
   (refresh (outer (page-wwin page)))
@@ -97,7 +97,7 @@
   (menu-refresh (page-datum page 'menu)))
 
 
-(define (essid-page-init p)
+(define (wireless-page-init p)
   (let* ((s (page-surface p))
          (pr (make-boxed-window  #f
                                  (- (getmaxy s) 4) (- (getmaxx s) 2)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]