[aisleriot] Pass #f as the destination before the format string



commit 7a22eecceea9157a8912c89834a3bf7cb2512734
Author: Christian Persch <chpe gnome org>
Date:   Sat Apr 16 13:06:03 2011 +0200

    Pass #f as the destination before the format string
    
    Omitting the destination on a call to format is deprecated.

 games/agnes.scm          |    2 +-
 games/cruel.scm          |    3 ++-
 games/eagle_wing.scm     |    2 +-
 games/fortunes.scm       |    6 ++++--
 games/gaps.scm           |    7 +++++--
 games/giant.scm          |    3 ++-
 games/golf.scm           |    2 +-
 games/kings_audience.scm |    3 ++-
 games/osmosis.scm        |    4 ++--
 games/plait.scm          |    4 ++--
 games/spider.scm         |    3 ++-
 games/terrace.scm        |    2 +-
 12 files changed, 25 insertions(+), 16 deletions(-)
---
diff --git a/games/agnes.scm b/games/agnes.scm
index 2e8b630..7286027 100644
--- a/games/agnes.scm
+++ b/games/agnes.scm
@@ -65,7 +65,7 @@
 (define (get-base-string)
   (cond ((and (> BASE-VAL 1)
 	      (< BASE-VAL 11))
-	 (format (_"Base Card: ~a") (number->string BASE-VAL)))
+	 (format #f (_"Base Card: ~a") (number->string BASE-VAL)))
 	((= BASE-VAL 1)
 	 (_"Base Card: Ace"))
 	((= BASE-VAL 11)
diff --git a/games/cruel.scm b/games/cruel.scm
index 412b9ab..6df8fee 100644
--- a/games/cruel.scm
+++ b/games/cruel.scm
@@ -151,7 +151,8 @@
 )
 
 (define (give-status)
-  (set-statusbar-message (format (_"Cards remaining: ~a") 
+  (set-statusbar-message (format #f 
+                                 (_"Cards remaining: ~a") 
 				 (number->string (- 48 (get-score)))))
                          
 )
diff --git a/games/eagle_wing.scm b/games/eagle_wing.scm
index 3d335d1..c59ba89 100644
--- a/games/eagle_wing.scm
+++ b/games/eagle_wing.scm
@@ -264,7 +264,7 @@
   (if (and (not (empty-slot? slot))
 	   (is-visible? (get-top-card slot)))
       (cond ((= (get-value (get-top-card slot)) BASE-VAL)
-	     (list 0 (format (_"Move ~a to an empty foundation") (get-name (get-top-card slot)))))
+	     (list 0 (format #f (_"Move ~a to an empty foundation") (get-name (get-top-card slot)))))
 	    ((check-a-foundation slot 2)
 	     (list 1 
 		   (get-name (get-top-card slot)) 
diff --git a/games/fortunes.scm b/games/fortunes.scm
index 30751f8..fd62420 100644
--- a/games/fortunes.scm
+++ b/games/fortunes.scm
@@ -129,9 +129,11 @@
 		    (get-suit (get-top-card slot2))))
 	  (if (< (get-value (get-top-card slot1))
 		 (get-value (get-top-card slot2)))
-	      (list 0 (format (_"Move ~a off the board") 
+	      (list 0 (format #f 
+                              (_"Move ~a off the board") 
                               (get-name (get-top-card slot1))))
-	      (list 0 (format (_"Move ~a off the board") 
+	      (list 0 (format #f 
+                              (_"Move ~a off the board") 
                               (get-name (get-top-card slot2)))))
 	  (check-hint slot1 (+ 1 slot2)))))
 
diff --git a/games/gaps.scm b/games/gaps.scm
index c32047a..99b7421 100644
--- a/games/gaps.scm
+++ b/games/gaps.scm
@@ -287,10 +287,12 @@
 (define (add-to-sequence? row)
   (if (empty-slot? (car (vector-ref rows row)))
       (if (= 0 (modulo (car (vector-ref rows row)) 13))
-          (list 0 (format (_"Place a two in the leftmost slot of row ~a.")
+          (list 0 (format #f
+                          (_"Place a two in the leftmost slot of row ~a.")
 			  (number->string (+ row 1))))
           (if (not (= 12 (modulo (car (vector-ref rows row)) 13)))
-	      (list 0 (format (_"Add to the sequence in row ~a.")
+	      (list 0 (format #f
+                              (_"Add to the sequence in row ~a.")
 			      (number->string (+ row 1))))
 	      (if (< row 3)
 		  (add-to-sequence? (+ row 1))
@@ -308,6 +310,7 @@
 	       )
 	  (let ((target-card (get-top-card (- (car slotlist) 1))))
 	    (list 0 (format
+                     #f
                      (_"Place the ~a next to ~a.")
 		     (get-name (add-to-value target-card 1))
 		     (get-name target-card))))
diff --git a/games/giant.scm b/games/giant.scm
index da4fb85..b60ce75 100644
--- a/games/giant.scm
+++ b/games/giant.scm
@@ -70,7 +70,8 @@
 )
 
 (define (get-stock-no-string)
-  (format (_"Deals left: ~a")
+  (format #f
+          (_"Deals left: ~a")
           (number->string (/ (length (get-cards stock-slot)) 8 ))
   )
 )
diff --git a/games/golf.scm b/games/golf.scm
index 99085ff..cc0b621 100644
--- a/games/golf.scm
+++ b/games/golf.scm
@@ -62,7 +62,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (format (_"Stock left: ~a") (number->string (length (get-cards stock)))))
+  (format #f (_"Stock left: ~a") (number->string (length (get-cards stock)))))
 
 (define (button-pressed slot-id card-list)
   (and (not (empty-slot? slot-id))
diff --git a/games/kings_audience.scm b/games/kings_audience.scm
index 1232166..70a5683 100644
--- a/games/kings_audience.scm
+++ b/games/kings_audience.scm
@@ -82,7 +82,8 @@
 )
 
 (define (give-status)
-  (set-statusbar-message (format (_"Stock remaining: ~a")
+  (set-statusbar-message (format #f
+                                 (_"Stock remaining: ~a")
                                  (number->string (length (get-cards stock)))
                          )
   )
diff --git a/games/osmosis.scm b/games/osmosis.scm
index 0c1fa26..c781be1 100644
--- a/games/osmosis.scm
+++ b/games/osmosis.scm
@@ -63,13 +63,13 @@
 					(get-redeals-string))))
 
 (define (get-stock-no-string)
-  (format (_"Stock left: ~a") (number->string (length (get-cards 8))))
+  (format #f (_"Stock left: ~a") (number->string (length (get-cards 8))))
 )
 
 (define (get-redeals-string)
   (if deal-three
     ""
-    (format (_"Redeals left: ~a") (number->string (- 2 FLIP-COUNTER)))
+    (format #f (_"Redeals left: ~a") (number->string (- 2 FLIP-COUNTER)))
   )
 )
 
diff --git a/games/plait.scm b/games/plait.scm
index f6790b8..1cc9ce3 100644
--- a/games/plait.scm
+++ b/games/plait.scm
@@ -91,7 +91,7 @@
 	   (if (not (empty-slot? (car home-list)))
 	       (list 1 (get-name (get-top-card slot))
 		     (get-name (get-top-card (car home-list))))
-	       (list 0 (format (_"Move ~a to an empty field") (get-name (get-top-card slot)))))
+	       (list 0 (format #f (_"Move ~a to an empty field") (get-name (get-top-card slot)))))
 	   (get-valid-move slot (cdr home-list)))))
 
 (define (get-valid-moves slot-list home-list)
@@ -354,7 +354,7 @@
 		       '(3 4 11 12 17 18 21 22))
       (deal-possible?)
       (if (find-valid-move stock '(0 2 5 6 7 8 13 14 15 16 19 20))
-	  (list 0 (format (_"Move ~a from the stock to an empty edge or tableau slot") 
+	  (list 0 (format #f (_"Move ~a from the stock to an empty edge or tableau slot") 
 		  (get-name (get-top-card stock))))
 	  #f)))
 
diff --git a/games/spider.scm b/games/spider.scm
index adf2397..2026986 100644
--- a/games/spider.scm
+++ b/games/spider.scm
@@ -82,7 +82,8 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (format (_"Stock left: ~a")
+  (format #f
+          (_"Stock left: ~a")
 	  (number->string (length (get-cards stock)))))
 
 ;internal procedures/variables
diff --git a/games/terrace.scm b/games/terrace.scm
index d043d45..a66fb9c 100644
--- a/games/terrace.scm
+++ b/games/terrace.scm
@@ -134,7 +134,7 @@
 (define (get-base-string)
   (cond ((and (> BASE-VAL 1)
               (< BASE-VAL 11))
-         (format (_"Base Card: ~a") (number->string BASE-VAL)))
+         (format #f (_"Base Card: ~a") (number->string BASE-VAL)))
         ((= BASE-VAL 1)
          (_"Base Card: Ace"))
         ((= BASE-VAL 11)



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