r14965 - gnucash/branches/swig-redo/src - Automated rename of swig-wrapped guile-utils functions to their swig-names.

Chris Shoemaker chris at cvs.gnucash.org
Mon Oct 9 19:58:41 EDT 2006


Author: chris
Date: 2006-10-09 19:58:40 -0400 (Mon, 09 Oct 2006)
New Revision: 14965
Trac: http://svn.gnucash.org/trac/changeset/14965

Modified:
   gnucash/branches/swig-redo/src/business/business-gnome/business-gnome.scm
   gnucash/branches/swig-redo/src/business/business-reports/business-reports.scm
   gnucash/branches/swig-redo/src/gnome-utils/gnome-utils.scm
   gnucash/branches/swig-redo/src/report/report-gnome/report-gnome.scm
   gnucash/branches/swig-redo/src/report/report-system/html-utilities.scm
   gnucash/branches/swig-redo/src/report/report-system/report-utilities.scm
   gnucash/branches/swig-redo/src/report/report-system/report.scm
   gnucash/branches/swig-redo/src/report/standard-reports/budget.scm
   gnucash/branches/swig-redo/src/report/standard-reports/cash-flow.scm
   gnucash/branches/swig-redo/src/report/utility-reports/hello-world.scm
   gnucash/branches/swig-redo/src/report/utility-reports/test-graphing.scm
   gnucash/branches/swig-redo/src/report/utility-reports/view-column.scm
   gnucash/branches/swig-redo/src/scm/main-window.scm
   gnucash/branches/swig-redo/src/scm/price-quotes.scm
   gnucash/branches/swig-redo/src/scm/printing/print-check.scm
Log:
Automated rename of swig-wrapped guile-utils functions to their swig-names.

s/gnc:option-dialog-new/gnc-options-dialog-new/g
s/gnc:option-dialog-destroy/gnc-options-dialog-destroy/g
s/gnc:option-dialog-build-contents/gnc-options-dialog-build-contents/g
s/gnc:option-dialog-set-callbacks/gnc-options-dialog-set-scm-callbacks/g
s/gnc:print-session/gnc-print-session/g

s/gnc:error-dialog/gnc-error-dialog/g
s/gnc:verify-dialog/gnc-verify-dialog/g
s/gnc:info-dialog/gnc-info-dialog/g
s/gnc:warning-dialog/gnc-warning-dialog/g

s/gnc:add-extension/gnc-add-scm-extension/g

s/gnc:html-encode-string/gnc-html-encode-string/g
s/gnc:html-build-url/gnc-build-url/g

s/gnc:set-busy-cursor/gnc-set-busy-cursor/g
s/gnc:unset-busy-cursor/gnc-unset-busy-cursor/g
s/gnc:window-show-progress/gnc-window-show-progress/g
s/gnc:ui-is-running?/gnucash-ui-is-running/g

s/gnc:url-type-customer/URL-TYPE-CUSTOMER/g

s/gnc:url-type-file/URL-TYPE-FILE/g
s/gnc:url-type-jump/URL-TYPE-JUMP/g
s/gnc:url-type-http/URL-TYPE-HTTP/g
s/gnc:url-type-ftp/URL-TYPE-FTP/g
s/gnc:url-type-secure/URL-TYPE-SECURE/g
s/gnc:url-type-register/URL-TYPE-REGISTER/g
s/gnc:url-type-accttree/URL-TYPE-ACCTTREE/g
s/gnc:url-type-report/URL-TYPE-REPORT/g
s/gnc:url-type-options/URL-TYPE-OPTIONS/g
s/gnc:url-type-scheme/URL-TYPE-SCHEME/g
s/gnc:url-type-help/URL-TYPE-HELP/g
s/gnc:url-type-xmldata/URL-TYPE-XMLDATA/g
s/gnc:url-type-price/URL-TYPE-PRICE/g
s/gnc:url-type-other/URL-TYPE-OTHER/g



Modified: gnucash/branches/swig-redo/src/business/business-gnome/business-gnome.scm
===================================================================
--- gnucash/branches/swig-redo/src/business/business-gnome/business-gnome.scm	2006-10-09 23:57:43 UTC (rev 14964)
+++ gnucash/branches/swig-redo/src/business/business-gnome/business-gnome.scm	2006-10-09 23:58:40 UTC (rev 14965)
@@ -21,7 +21,7 @@
     (set-current-module m)))
 
 (define (business-report-function)
-  (gnc:add-extension
+  (gnc-add-scm-extension
    (gnc:make-menu gnc:menuname-business-reports
 		  (list gnc:menuname-reports))))
 

Modified: gnucash/branches/swig-redo/src/business/business-reports/business-reports.scm
===================================================================
--- gnucash/branches/swig-redo/src/business/business-reports/business-reports.scm	2006-10-09 23:57:43 UTC (rev 14964)
+++ gnucash/branches/swig-redo/src/business/business-reports/business-reports.scm	2006-10-09 23:58:40 UTC (rev 14965)
@@ -29,13 +29,13 @@
 (gnc:module-load "gnucash/business-utils" 0)
 
 ;; this defines URL-TYPE-OWNERREPORT and pulls in gnome-utils
-;; to define gnc:html-build-url
+;; to define gnc-build-url
 (gnc:module-load "gnucash/business-gnome" 0)
 
 (define gnc:menuname-business-reports (N_ "_Business"))
 
 (define (guid-ref idstr type guid)
-  (gnc:html-build-url type (string-append idstr guid) #f))
+  (gnc-build-url type (string-append idstr guid) ""))
 
 (define (gnc:customer-anchor-text customer)
   (guid-ref "customer=" URL-TYPE-CUSTOMER (gncCustomerReturnGUID customer)))
@@ -93,7 +93,7 @@
 	  (if acc
 	      (set! ref (string-append ref "&acct="
 				       (gnc:account-get-guid acc))))
-	  (gnc:html-build-url URL-TYPE-OWNERREPORT ref #f))
+	  (gnc-build-url URL-TYPE-OWNERREPORT ref ""))
 	ref)))
 
 (export gnc:menuname-business-reports)

Modified: gnucash/branches/swig-redo/src/gnome-utils/gnome-utils.scm
===================================================================
--- gnucash/branches/swig-redo/src/gnome-utils/gnome-utils.scm	2006-10-09 23:57:43 UTC (rev 14964)
+++ gnucash/branches/swig-redo/src/gnome-utils/gnome-utils.scm	2006-10-09 23:58:40 UTC (rev 14965)
@@ -22,16 +22,16 @@
 (define (gnc:kvp-option-dialog id-type slots title changed_cb)
   (let* ((options (gnc:make-kvp-options id-type))
 	 (optiondb (gnc:option-db-new options))
-	 (optionwin (gnc:option-dialog-new title)))
+	 (optionwin (gnc-options-dialog-new title)))
 
     (define (apply-cb)
       (gnc:options-scm->kvp options slots gnc:*kvp-option-path* #t)
       (if changed_cb (changed_cb)))
 
     (define (close-cb)
-      (gnc:option-dialog-destroy optionwin)
+      (gnc-options-dialog-destroy optionwin)
       (gnc:option-db-destroy optiondb))
 
     (gnc:options-kvp->scm options slots gnc:*kvp-option-path*)
-    (gnc:option-dialog-set-callbacks optionwin apply-cb close-cb)
-    (gnc:option-dialog-build-contents optionwin optiondb)))
+    (gnc-options-dialog-set-scm-callbacks optionwin apply-cb close-cb)
+    (gnc-options-dialog-build-contents optionwin optiondb)))

Modified: gnucash/branches/swig-redo/src/report/report-gnome/report-gnome.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-gnome/report-gnome.scm	2006-10-09 23:57:43 UTC (rev 14964)
+++ gnucash/branches/swig-redo/src/report/report-gnome/report-gnome.scm	2006-10-09 23:58:40 UTC (rev 14965)
@@ -45,7 +45,7 @@
                        (gnc:report-options report)
                        report))
                 (gnc:report-set-editor-widget! report editor-widg))
-              (gnc:warning-dialog '() (_ "This report has no options.")))))))
+              (gnc-warning-dialog '() (_ "This report has no options.")))))))
 
 (define (gnc:add-report-template-menu-items)
   (define *template-items* '())
@@ -80,7 +80,7 @@
                    (let ((report (gnc:make-report
                                   (gnc:report-template-name template))))
                      (gnc-main-window-open-report report window)))))
-          (gnc:add-extension item))))
+          (gnc-add-scm-extension item))))
 
   (define (add-template name template)
     (let ((menu-name (gnc:report-template-menu-name template)))
@@ -108,11 +108,11 @@
   (define tax-menu 
     (gnc:make-menu gnc:menuname-taxes (list gnc:menuname-reports)))
 
-  ;; (gnc:add-extension tax-menu)
-  (gnc:add-extension income-expense-menu)
-  (gnc:add-extension asset-liability-menu)
-  (gnc:add-extension utility-menu)
-  (gnc:add-extension custom-menu)
+  ;; (gnc-add-scm-extension tax-menu)
+  (gnc-add-scm-extension income-expense-menu)
+  (gnc-add-scm-extension asset-liability-menu)
+  (gnc-add-scm-extension utility-menu)
+  (gnc-add-scm-extension custom-menu)
 
   ;; run report-hook danglers
   (gnc:hook-run-danglers gnc:*report-hook*)
@@ -121,7 +121,7 @@
   (gnc:add-report-template-menu-items)
 
   ;; the Welcome to GnuCash "extravaganza" report
-  (gnc:add-extension 
+  (gnc-add-scm-extension
    (gnc:make-menu-item 
     (N_ "Welcome Sample Report")
     (N_ "Welcome-to-GnuCash report screen")

Modified: gnucash/branches/swig-redo/src/report/report-system/html-utilities.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/html-utilities.scm	2006-10-09 23:57:43 UTC (rev 14964)
+++ gnucash/branches/swig-redo/src/report/report-system/html-utilities.scm	2006-10-09 23:58:40 UTC (rev 14965)
@@ -30,7 +30,7 @@
       (list)))
 
 (define (gnc:register-guid type guid)
-  (gnc:html-build-url gnc:url-type-register (string-append type guid) #f))
+  (gnc-build-url URL-TYPE-REGISTER (string-append type guid) ""))
 
 (define (gnc:account-anchor-text acct)
   (gnc:register-guid "acct-guid=" (gnc:account-get-guid acct)))
@@ -42,14 +42,14 @@
   (gnc:register-guid "trans-guid=" (gnc:transaction-get-guid trans)))
 
 (define (gnc:report-anchor-text report-id)
-  (gnc:html-build-url gnc:url-type-report
+  (gnc-build-url URL-TYPE-REPORT
 		      (string-append "id=" (number->string report-id))
-		      #f))
+		      ""))
 
 (define (gnc:price-anchor-text price)
-  (gnc:html-build-url gnc:url-type-price
+  (gnc-build-url URL-TYPE-PRICE
 		      (string-append "price-guid=" (gnc:price-get-guid price))
-		      #f))
+		      ""))
 
 ;; Make a new report and return the anchor to it. The new report of
 ;; type 'reportname' will have the option values copied from
@@ -804,10 +804,10 @@
 	 p
 	 (gnc:html-markup-p
 	  (gnc:html-markup-anchor
-	   (gnc:html-build-url gnc:url-type-options
+	   (gnc-build-url URL-TYPE-OPTIONS
 			       (string-append "report-id="
 					      (sprintf #f "%a" report-id))
-			       #f)
+			       "")
 	   (_ "Edit report options")))))
     p))
 
@@ -828,10 +828,10 @@
 	 p 
 	 (gnc:html-markup-p
 	  (gnc:html-markup-anchor
-	   (gnc:html-build-url gnc:url-type-options
+	   (gnc-build-url URL-TYPE-OPTIONS
 			       (string-append "report-id="
 					      (sprintf #f "%a" report-id))
-			       #f)
+			       "")
 	   (_ "Edit report options")))))
     p))
 
@@ -850,9 +850,9 @@
 	 p 
 	 (gnc:html-markup-p
 	  (gnc:html-markup-anchor
-	   (gnc:html-build-url gnc:url-type-options
+	   (gnc-build-url URL-TYPE-OPTIONS
 			       (string-append "report-id="
 					      (sprintf #f "%a" report-id))
-			       #f)
+			       "")
 	   (_ "Edit report options")))))
     p))

Modified: gnucash/branches/swig-redo/src/report/report-system/report-utilities.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/report-utilities.scm	2006-10-09 23:57:43 UTC (rev 14964)
+++ gnucash/branches/swig-redo/src/report/report-system/report-utilities.scm	2006-10-09 23:58:40 UTC (rev 14965)
@@ -687,13 +687,13 @@
     (gnc:transaction-get-void-status trans)))
 
 (define (gnc:report-starting report-name)
-  (gnc:window-show-progress (sprintf #f
+  (gnc-window-show-progress (sprintf #f
 				     (_ "Building '%s' report ...")
 				     (gnc:gettext report-name))
 			    0))
 
 (define (gnc:report-render-starting report-name)
-  (gnc:window-show-progress (sprintf #f
+  (gnc-window-show-progress (sprintf #f
 				     (_ "Rendering '%s' report ...")
 				     (if (string-null? report-name)
 					 (gnc:gettext "Untitled")
@@ -701,10 +701,10 @@
 			    0))
 
 (define (gnc:report-percent-done percent)
-  (gnc:window-show-progress "" percent))
+  (gnc-window-show-progress "" percent))
 
 (define (gnc:report-finished)
-  (gnc:window-show-progress "" -1))
+  (gnc-window-show-progress "" -1))
 
 ;; function to count the total number of splits to be iterated
 (define (gnc:accounts-count-splits accounts)

Modified: gnucash/branches/swig-redo/src/report/report-system/report.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/report.scm	2006-10-09 23:57:43 UTC (rev 14964)
+++ gnucash/branches/swig-redo/src/report/report-system/report.scm	2006-10-09 23:58:40 UTC (rev 14965)
@@ -99,9 +99,9 @@
 			 (gnc:report-template-name report-rec) report-rec)
 	      (begin
 		;; FIXME: We should pass the top-level window
-		;; instead of the '() to gnc:error-dialog, but I
+		;; instead of the '() to gnc-error-dialog, but I
 		;; have no idea where to get it from.
-		(gnc:error-dialog '() (string-append (_ "A custom report with this name already exists. Either rename the report to store it with a different name, or edit your saved-reports file and delete the section with the following name: ") name ))
+		(gnc-error-dialog '() (string-append (_ "A custom report with this name already exists. Either rename the report to store it with a different name, or edit your saved-reports file and delete the section with the following name: ") name ))
 		)))
         (gnc:warn "gnc:define-report: bad report"))))
 
@@ -436,7 +436,7 @@
   (let ((report (gnc-report-find id))
 	(start-time (gettimeofday))
 	(html #f))
-    (gnc:set-busy-cursor #f #t)
+    (gnc-set-busy-cursor '() #t)
     (gnc:backtrace-if-exception 
      (lambda ()
        (if report
@@ -447,7 +447,7 @@
 ;;	     (newline)
 ;;	     (display html) (newline)
 	     ))))
-    (gnc:unset-busy-cursor #f)
+    (gnc-unset-busy-cursor '())
     html))
 
 

Modified: gnucash/branches/swig-redo/src/report/standard-reports/budget.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/budget.scm	2006-10-09 23:57:43 UTC (rev 14964)
+++ gnucash/branches/swig-redo/src/report/standard-reports/budget.scm	2006-10-09 23:58:40 UTC (rev 14965)
@@ -34,7 +34,7 @@
 (require 'sort)
 
 (gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/gnome-utils" 0) ;for gnc:html-build-url
+(gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url
 
 (define reportname (N_ "Budget Report"))
 

Modified: gnucash/branches/swig-redo/src/report/standard-reports/cash-flow.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/cash-flow.scm	2006-10-09 23:57:43 UTC (rev 14964)
+++ gnucash/branches/swig-redo/src/report/standard-reports/cash-flow.scm	2006-10-09 23:58:40 UTC (rev 14965)
@@ -36,7 +36,7 @@
 (require 'sort)
 
 (gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/gnome-utils" 0) ;for gnc:html-build-url
+(gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url
 
 (define reportname (N_ "Cash Flow"))
 

Modified: gnucash/branches/swig-redo/src/report/utility-reports/hello-world.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/utility-reports/hello-world.scm	2006-10-09 23:57:43 UTC (rev 14964)
+++ gnucash/branches/swig-redo/src/report/utility-reports/hello-world.scm	2006-10-09 23:58:40 UTC (rev 14965)
@@ -12,7 +12,7 @@
 (debug-enable 'backtrace)
 
 (gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/gnome-utils" 0) ;for gnc:html-build-url
+(gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url
 
 ;; This function will generate a set of options that GnuCash
 ;; will use to display a dialog where the user can select
@@ -431,7 +431,7 @@
       ;; Account Name" to html-markup-anchor.  The account name
       ;; passed must be the "full" account name that you get from
       ;; gnc:account-get-full-name.  You should build this url using
-      ;; (gnc:html-build-url ...)
+      ;; (gnc-build-url ...)
       ;;
       ;; html-markup-anchor takes the link to jump to as its first
       ;; arg and then puts the remaining args in the body of the
@@ -447,11 +447,11 @@
              (map 
               (lambda (acct)
                 (gnc:html-markup-anchor 
-		 (gnc:html-build-url gnc:url-type-register
+		 (gnc-build-url URL-TYPE-REGISTER
 				     (string-append "account=" 
 						    (gnc:account-get-full-name
 						     acct))
-				     #f)
+				     "")
                  (gnc:account-get-name acct)))
               accounts))))
           (gnc:html-document-add-object!

Modified: gnucash/branches/swig-redo/src/report/utility-reports/test-graphing.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/utility-reports/test-graphing.scm	2006-10-09 23:57:43 UTC (rev 14964)
+++ gnucash/branches/swig-redo/src/report/utility-reports/test-graphing.scm	2006-10-09 23:58:40 UTC (rev 14965)
@@ -12,7 +12,7 @@
 (debug-enable 'backtrace)
 
 (gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/gnome-utils" 0) ;for gnc:html-build-url
+(gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url
 
 (define (simple-pie-chart)
   (let ((chart (gnc:make-html-piechart)))

Modified: gnucash/branches/swig-redo/src/report/utility-reports/view-column.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/utility-reports/view-column.scm	2006-10-09 23:57:43 UTC (rev 14964)
+++ gnucash/branches/swig-redo/src/report/utility-reports/view-column.scm	2006-10-09 23:58:40 UTC (rev 14965)
@@ -35,7 +35,7 @@
 (require 'printf)
 
 (gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/gnome-utils" 0) ;for gnc:html-build-url
+(gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url
 
 (define (make-options)
   (let* ((options (gnc:new-options))
@@ -166,19 +166,19 @@
 	  report-table 
 	  (list (gnc:make-html-text 
 		 (gnc:html-markup-anchor
-		  (gnc:html-build-url 
-		   gnc:url-type-options
+		  (gnc-build-url
+		   URL-TYPE-OPTIONS
 		   (string-append "report-id=" 
 				  (sprintf #f "%a" (car report-info)))
-		   #f)
+		   "")
 		  (_ "Edit Options"))
 		 " "
 		 (gnc:html-markup-anchor
-		  (gnc:html-build-url
-		   gnc:url-type-report
+		  (gnc-build-url
+		   URL-TYPE-REPORT
 		   (string-append "id=" 
 				  (sprintf #f "%a" (car report-info)))
-		   #f)
+		   "")
 		  (_ "Single Report")))))
 
 	 ;; add the report-table to the toplevel-cell

Modified: gnucash/branches/swig-redo/src/scm/main-window.scm
===================================================================
--- gnucash/branches/swig-redo/src/scm/main-window.scm	2006-10-09 23:57:43 UTC (rev 14964)
+++ gnucash/branches/swig-redo/src/scm/main-window.scm	2006-10-09 23:58:40 UTC (rev 14965)
@@ -40,7 +40,7 @@
           #f)))
 
   (let* ((book-url (gnc:session-get-url session))
-	 (conf-file-name (gnc:html-encode-string book-url))
+	 (conf-file-name (gnc-html-encode-string book-url))
 	 (dead-reports '()))
     (if conf-file-name 
         (try-load conf-file-name))

Modified: gnucash/branches/swig-redo/src/scm/price-quotes.scm
===================================================================
--- gnucash/branches/swig-redo/src/scm/price-quotes.scm	2006-10-09 23:57:43 UTC (rev 14964)
+++ gnucash/branches/swig-redo/src/scm/price-quotes.scm	2006-10-09 23:58:40 UTC (rev 14965)
@@ -632,47 +632,47 @@
     (cond
      ((eq? fq-call-data #f)
       (set! keep-going? #f)
-      (if (gnc:ui-is-running?)
-          (gnc:error-dialog window (_ "No commodities marked for quote retrieval."))
+      (if (gnucash-ui-is-running)
+          (gnc-error-dialog window (_ "No commodities marked for quote retrieval."))
 	  (gnc:warn (_ "No commodities marked for quote retrieval."))))
      ((eq? fq-results #f)
       (set! keep-going? #f)
-      (if (gnc:ui-is-running?)
-          (gnc:error-dialog window (_ "Unable to get quotes or diagnose the problem."))
+      (if (gnucash-ui-is-running)
+          (gnc-error-dialog window (_ "Unable to get quotes or diagnose the problem."))
 	  (gnc:warn (_ "Unable to get quotes or diagnose the problem."))))
      ((member 'missing-lib fq-results)
       (set! keep-going? #f)
-      (if (gnc:ui-is-running?)
-          (gnc:error-dialog window
+      (if (gnucash-ui-is-running)
+          (gnc-error-dialog window
            (_ "You are missing some needed Perl libraries.
 Run 'gnc-fq-update' as root to install them."))
           (gnc:warn (_ "You are missing some needed Perl libraries.
 Run 'gnc-fq-update' as root to install them.") "\n")))
      ((member 'system-error fq-results)
       (set! keep-going? #f)
-      (if (gnc:ui-is-running?)
-          (gnc:error-dialog window
+      (if (gnucash-ui-is-running)
+          (gnc-error-dialog window
            (_ "There was a system error while retrieving the price quotes."))
           (gnc:warn (_ "There was a system error while retrieving the price quotes.") "\n")))
      ((not (list? (car fq-results)))
       (set! keep-going? #f)
-      (if (gnc:ui-is-running?)
-          (gnc:error-dialog window
+      (if (gnucash-ui-is-running)
+          (gnc-error-dialog window
            (_ "There was an unknown error while retrieving the price quotes."))
           (gnc:warn (_ "There was an unknown error while retrieving the price quotes.") "\n")))
-     ((and (not commod-tz-quote-triples) (gnc:ui-is-running?))
-      (gnc:error-dialog window
+     ((and (not commod-tz-quote-triples) (gnucash-ui-is-running))
+      (gnc-error-dialog window
        (_ "Unable to get quotes or diagnose the problem."))
        (set! keep-going? #f))
      ((not commod-tz-quote-triples)
       (gnc:warn (_ "Unable to get quotes or diagnose the problem."))
       (set! keep-going? #f))
      ((not (null? problem-syms))
-      (if (gnc:ui-is-running?)
+      (if (gnucash-ui-is-running)
           (if (and ok-syms (not (null? ok-syms)))
               (set!
                keep-going?
-               (gnc:verify-dialog window #t
+               (gnc-verify-dialog window #t
                 (call-with-output-string
                  (lambda (p)
                    (display (_ "Unable to retrieve quotes for these items:") p)
@@ -682,7 +682,7 @@
                    (newline p)
                    (display (_ "Continue using only the good quotes?") p)))))
               (begin
-                (gnc:error-dialog window
+                (gnc-error-dialog window
                  (call-with-output-string
                   (lambda (p)
                     (display
@@ -708,10 +708,10 @@
                           (commodity-tz-quote-triple->price book triple))
                         ok-syms)))
        (if (any string? prices)
-           (if (gnc:ui-is-running?)
+           (if (gnucash-ui-is-running)
                (set!
                 keep-going?
-                (gnc:verify-dialog window #t
+                (gnc-verify-dialog window #t
                  (call-with-output-string
                   (lambda (p)
                     (display (_ "Unable to create prices for these items:") p)

Modified: gnucash/branches/swig-redo/src/scm/printing/print-check.scm
===================================================================
--- gnucash/branches/swig-redo/src/scm/printing/print-check.scm	2006-10-09 23:57:43 UTC (rev 14964)
+++ gnucash/branches/swig-redo/src/scm/printing/print-check.scm	2006-10-09 23:58:40 UTC (rev 14965)
@@ -101,7 +101,7 @@
 	 (frac-part (inexact->exact 
                      (truncate 
                       (+ (/ .5 100) (* 100 (- amount int-part))))))
-	 (ps (gnc:print-session-create #t))
+	 (ps (gnc-print-session-create #t))
 	 (format #f)
 	 (offset #f)
 	 (date-string "")
@@ -146,71 +146,71 @@
 	    (begin
 	      (display "translate by ") (display (cadr translate-pos))
 	      (display " ") (display (caddr translate-pos)) (newline)
-	      (gnc:print-session-translate ps (cadr translate-pos)
+	      (gnc-print-session-translate ps (cadr translate-pos)
 					   (caddr translate-pos)))))
 
       (let ((rotate-angle (assq 'rotate format)))
-	(if rotate-angle (gnc:print-session-rotate ps (cdr rotate-angle))))
+	(if rotate-angle (gnc-print-session-rotate ps (cdr rotate-angle))))
 
       (let ((date-pos (assq 'date format)))
-        (gnc:print-session-moveto ps (cadr date-pos) 
+        (gnc-print-session-moveto ps (cadr date-pos)
                                   (+ offset (caddr date-pos)))
-        (gnc:print-session-text ps date-string))
+        (gnc-print-session-text ps date-string))
       
       (let ((payee-pos (assq 'payee format)))
-        (gnc:print-session-moveto ps (cadr payee-pos) 
+        (gnc-print-session-moveto ps (cadr payee-pos)
                                   (+ offset (caddr payee-pos)))
-        (gnc:print-session-text ps payee))
+        (gnc-print-session-text ps payee))
       
       (let ((number-pos (assq 'amount-number format)))
-        (gnc:print-session-moveto ps (cadr number-pos) 
+        (gnc-print-session-moveto ps (cadr number-pos)
                                   (+ offset (caddr number-pos)))
-        (gnc:print-session-text ps (printable-value amount 100)))
+        (gnc-print-session-text ps (printable-value amount 100)))
       
       (let ((words-pos (assq 'amount-words format)))
-        (gnc:print-session-moveto ps (cadr words-pos) 
+        (gnc-print-session-moveto ps (cadr words-pos)
                                   (+ offset (caddr words-pos)))
-        (gnc:print-session-text ps (number-to-words amount 100)))
+        (gnc-print-session-text ps (number-to-words amount 100)))
 
       (if (not (eq? (print-check-format:format format-info) 'wallet))
         (let ((memo-pos (assq 'memo format)))
-          (gnc:print-session-moveto ps (cadr memo-pos) 
+          (gnc-print-session-moveto ps (cadr memo-pos)
                                     (+ offset (caddr memo-pos)))
-          (gnc:print-session-text ps memo)))
+          (gnc-print-session-text ps memo)))
 
       (if (eq? (print-check-format:format format-info) 'wallet)
         (begin
            (let ((memo-pos (assq 'memo format)))
-             (gnc:print-session-moveto ps (cadr memo-pos) 
+             (gnc-print-session-moveto ps (cadr memo-pos)
                                   (+ offset (caddr memo-pos)))
              (if (< (string-length memo) 28)
-	          (gnc:print-session-text ps memo)
-	          (gnc:print-session-text ps (substring memo 0 27))))
+	          (gnc-print-session-text ps memo)
+	          (gnc-print-session-text ps (substring memo 0 27))))
            (let ((memostub-pos (assq 'memo-stub format)))
-             (gnc:print-session-moveto ps (cadr memostub-pos) 
+             (gnc-print-session-moveto ps (cadr memostub-pos)
                                   (+ offset (caddr memostub-pos)))
              (if (< (string-length memo) 22)
 	            (set! memo-stub-text memo)
 	            (set! memo-stub-text (substring memo 0 20)))
-             (gnc:print-session-text ps memo-stub-text))
+             (gnc-print-session-text ps memo-stub-text))
         
            (let ((datestub-pos (assq 'date-stub format)))
-              (gnc:print-session-moveto ps (cadr datestub-pos) 
+              (gnc-print-session-moveto ps (cadr datestub-pos)
                                   (+ offset (caddr datestub-pos)))
-             (gnc:print-session-text ps date-string))
+             (gnc-print-session-text ps date-string))
         
            (let ((payeestub-pos (assq 'payee-stub format)))
-                (gnc:print-session-moveto ps (cadr payeestub-pos) 
+                (gnc-print-session-moveto ps (cadr payeestub-pos)
                                   (+ offset (caddr payeestub-pos)))
               (if (< (string-length payee) 22)
 	            (set! payee-stub-text payee)
 	            (set! payee-stub-text (substring payee 0 20)))
-             (gnc:print-session-text ps payee-stub-text))
+             (gnc-print-session-text ps payee-stub-text))
         
            (let ((amountstub-pos (assq 'amount-stub format)))
-             (gnc:print-session-moveto ps (cadr amountstub-pos) 
+             (gnc-print-session-moveto ps (cadr amountstub-pos)
                                   (+ offset (caddr amountstub-pos)))
-             (gnc:print-session-text ps (printable-value amount 100)))))
+             (gnc-print-session-text ps (printable-value amount 100)))))
 
-      (gnc:print-session-done ps)))))
+      (gnc-print-session-done ps)))))
 



More information about the gnucash-changes mailing list