Rename libgnucash/scm/main.scm to utilities.scm

Because it hasn't been "main" since GnuCash became a C program.

gnucash/gnome-utils/gnome-utils.scm

@@ -19,7 +19,7 @@
 
 (define-module (gnucash gnome-utils))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 
 (eval-when

gnucash/import-export/qif-imp/qif-import.scm

@@ -25,7 +25,7 @@
 
 
 (define-module (gnucash import-export qif-import))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash app-utils))
 
 ;; We do this initialization here because src/gnome isn't a real module.

gnucash/report/business-reports/aging.scm

@@ -26,7 +26,7 @@
 
 (define-module (gnucash report aging))
 
-(use-modules (gnucash main))
+(use-modules (gnucash utilities))
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))

gnucash/report/business-reports/balsheet-eg.scm

@@ -32,7 +32,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-module (gnucash report balsheet-eg))
-(use-modules (gnucash main))
+(use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 (use-modules (gnucash report eguile-gnc))

gnucash/report/business-reports/customer-summary.scm

@@ -31,7 +31,7 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash printf))
-(use-modules (gnucash main))                ; for gnc:debug
+(use-modules (gnucash utilities))                ; for gnc:debug
 (use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)

gnucash/report/business-reports/job-report.scm

@@ -29,7 +29,7 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash main))		; for gnc:debug
+(use-modules (gnucash utilities))		; for gnc:debug
 (use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)

gnucash/report/business-reports/owner-report.scm

@@ -29,7 +29,7 @@
 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash main))        ; for gnc:debug
+(use-modules (gnucash utilities))        ; for gnc:debug
 (use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)

gnucash/report/business-reports/payables.scm

@@ -25,7 +25,7 @@
 
 (define-module (gnucash report payables))
 
-(use-modules (gnucash main))
+(use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

gnucash/report/business-reports/receipt.scm

@@ -17,7 +17,7 @@
 (define-module (gnucash report receipt))
 
 (use-modules (ice-9 local-eval))  ; for the-environment
-(use-modules (gnucash main))
+(use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 (gnc:module-load "gnucash/report/report-system" 0)

gnucash/report/business-reports/receivables.scm

@@ -25,7 +25,7 @@
 
 (define-module (gnucash report receivables))
 
-(use-modules (gnucash main))
+(use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

gnucash/report/business-reports/taxinvoice.scm

@@ -25,7 +25,7 @@
 (define-module (gnucash report taxinvoice))
 
 (use-modules (ice-9 local-eval))  ; for the-environment
-(use-modules (gnucash main))
+(use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 (gnc:module-load "gnucash/report/report-system" 0)

gnucash/report/locale-specific/us/taxtxf-de_DE.scm

@@ -67,7 +67,7 @@
 ;; depends must be outside module scope -- and should eventually go away.
 
 (define-module (gnucash report taxtxf-de_DE))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash printf))
 (use-modules (gnucash core-utils)) ; for gnc:version

gnucash/report/locale-specific/us/taxtxf.scm

@@ -92,7 +92,7 @@
 
 
 (define-module (gnucash report taxtxf))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))

gnucash/report/report-gnome/report-gnome.scm

@@ -25,7 +25,7 @@
 
 
 (define-module (gnucash report report-gnome))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gnome-utils))
 (use-modules (gnucash gettext))

gnucash/report/report-system/eguile-html-utilities.scm

@@ -26,7 +26,7 @@
 
 ; using all of these seems like overkill --
 ; not sure which are really required
-(use-modules (gnucash main))
+(use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash app-utils))
 (gnc:module-load "gnucash/report/report-system" 0)

gnucash/report/report-system/eguile-utilities.scm

@@ -26,7 +26,7 @@
 
 ; using all of these seems like overkill -- 
 ; not sure which are really required
-(use-modules (gnucash main))
+(use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash core-utils))

gnucash/report/report-system/report-collectors.scm

@@ -25,7 +25,7 @@
 (use-modules (ice-9 format))
 (use-modules (srfi srfi-1))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash printf))
 (use-modules (gnucash report report-system))
 (use-modules (gnucash app-utils))

gnucash/report/report-system/report-system.scm

@@ -25,7 +25,7 @@
 
 
 (define-module (gnucash report report-system))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (ice-9 regex))
 (use-modules (srfi srfi-1))
 (use-modules (srfi srfi-19))

gnucash/report/report-system/report.scm

@@ -20,7 +20,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash main))
+(use-modules (gnucash utilities))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash printf))
 (use-modules (gnucash gettext))

gnucash/report/report-system/test/test-test-extras.scm

@@ -95,7 +95,7 @@
 ;;
 
 ;(use-modules (gnucash engine))
-;(use-modules (gnucash main)) 
+;(use-modules (gnucash utilities)) 
 ;(use-modules (gnucash printf))
 ;(use-modules (gnucash report report-system))
 ;(use-modules (gnucash app-utils))

gnucash/report/standard-reports/account-piecharts.scm

@@ -25,7 +25,7 @@
 
 (define-module (gnucash report standard-reports account-piecharts))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
 (use-modules (ice-9 regex))
 (use-modules (gnucash gnc-module))

gnucash/report/standard-reports/account-summary.scm

@@ -51,7 +51,7 @@
 (define-module (gnucash report standard-reports account-summary))
 
 (use-modules (srfi srfi-1))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

gnucash/report/standard-reports/advanced-portfolio.scm

@@ -27,7 +27,7 @@
 
 (define-module (gnucash report standard-reports advanced-portfolio))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))

gnucash/report/standard-reports/average-balance.scm

@@ -28,7 +28,7 @@
 
 (define-module (gnucash report standard-reports average-balance))
 (use-modules (srfi srfi-1))
-(use-modules (gnucash main))
+(use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 (gnc:module-load "gnucash/report/report-system" 0)

gnucash/report/standard-reports/balance-sheet.scm

@@ -63,7 +63,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-module (gnucash report standard-reports balance-sheet))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

gnucash/report/standard-reports/budget-balance-sheet.scm

@@ -29,7 +29,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-module (gnucash report standard-reports budget-balance-sheet))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

gnucash/report/standard-reports/budget-barchart.scm

@@ -27,7 +27,7 @@
 (define-module (gnucash report standard-reports budget-barchart))
 
 (use-modules (srfi srfi-1))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

gnucash/report/standard-reports/budget-flow.scm

@@ -26,7 +26,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-module (gnucash report standard-reports budget-flow))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

gnucash/report/standard-reports/budget-income-statement.scm

@@ -41,7 +41,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-module (gnucash report standard-reports budget-income-statement))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))

gnucash/report/standard-reports/budget.scm

@@ -27,7 +27,7 @@
 
 (define-module (gnucash report standard-reports budget))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

gnucash/report/standard-reports/cash-flow.scm

@@ -28,7 +28,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-module (gnucash report standard-reports cash-flow))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 (use-modules (gnucash engine))

gnucash/report/standard-reports/cashflow-barchart.scm

@@ -29,7 +29,7 @@
 
 (define-module (gnucash report standard-reports cashflow-barchart))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 (use-modules (gnucash engine))

gnucash/report/standard-reports/category-barchart.scm

@@ -27,7 +27,7 @@
 (use-modules (gnucash report report-system report-collectors))
 (use-modules (gnucash report report-system collectors))
 (use-modules (srfi srfi-1))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (ice-9 regex))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))

gnucash/report/standard-reports/daily-reports.scm

@@ -29,7 +29,7 @@
 
 (define-module (gnucash report standard-reports daily-reports))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
 (use-modules (ice-9 regex))
 (use-modules (gnucash gnc-module))

gnucash/report/standard-reports/equity-statement.scm

@@ -46,7 +46,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-module (gnucash report standard-reports equity-statement))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

gnucash/report/standard-reports/general-journal.scm

@@ -28,7 +28,7 @@
 
 (define-module (gnucash report standard-reports general-journal))
 (export gnc:make-general-journal-report)
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

gnucash/report/standard-reports/general-ledger.scm

@@ -31,7 +31,7 @@
 
 (define-module (gnucash report standard-reports general-ledger))
 (export gnc:make-general-ledger-report)
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

gnucash/report/standard-reports/income-gst-statement.scm

@@ -34,7 +34,7 @@
 
 (define-module (gnucash report standard-reports income-gst-statement))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
 (use-modules (srfi srfi-13))
 (use-modules (ice-9 regex))

gnucash/report/standard-reports/income-statement.scm

@@ -42,7 +42,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-module (gnucash report standard-reports income-statement))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))

gnucash/report/standard-reports/net-barchart.scm

@@ -27,7 +27,7 @@
 (define-module (gnucash report standard-reports net-barchart))
 
 (use-modules (srfi srfi-1))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

gnucash/report/standard-reports/net-linechart.scm

@@ -28,7 +28,7 @@
 (define-module (gnucash report standard-reports net-linechart))
 
 (use-modules (srfi srfi-1))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

gnucash/report/standard-reports/portfolio.scm

@@ -23,7 +23,7 @@
 
 (define-module (gnucash report standard-reports portfolio))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))

gnucash/report/standard-reports/price-scatter.scm

@@ -24,7 +24,7 @@
 
 (define-module (gnucash report standard-reports price-scatter))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash core-utils))

gnucash/report/standard-reports/register.scm

@@ -22,7 +22,7 @@
 
 (define-module (gnucash report standard-reports register))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))

gnucash/report/standard-reports/standard-reports.scm

@@ -26,7 +26,7 @@
 
 (define-module (gnucash report standard-reports))
 (use-modules (srfi srfi-13))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash core-utils))
 
 (export gnc:register-report-create)

gnucash/report/standard-reports/sx-summary.scm

@@ -35,7 +35,7 @@
 (define-module (gnucash report standard-reports sx-summary))
 
 (use-modules (srfi srfi-1))
-(use-modules (gnucash main))
+(use-modules (gnucash utilities))
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))

gnucash/report/standard-reports/test/test-generic-category-report.scm

@@ -26,7 +26,7 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-load "gnucash/report/report-system" 0)
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash printf))
 (use-modules (gnucash report report-system))
 (use-modules (gnucash app-utils))

gnucash/report/standard-reports/test/test-standard-category-report.scm

@@ -30,7 +30,7 @@
 
 (gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash printf))
 (use-modules (gnucash report report-system))
 (use-modules (gnucash app-utils))

gnucash/report/standard-reports/transaction.scm

@@ -40,7 +40,7 @@
 
 (define-module (gnucash report standard-reports transaction))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
 (use-modules (srfi srfi-13))
 (use-modules (ice-9 regex))

gnucash/report/standard-reports/trial-balance.scm

@@ -51,7 +51,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-module (gnucash report standard-reports trial-balance))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))

gnucash/report/stylesheets/stylesheet-easy.scm

@@ -29,7 +29,7 @@
 
 (define-module (gnucash report stylesheet-easy))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

gnucash/report/stylesheets/stylesheet-fancy.scm

@@ -23,7 +23,7 @@
 
 (define-module (gnucash report stylesheet-fancy))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

gnucash/report/stylesheets/stylesheet-footer.scm

@@ -34,7 +34,7 @@
 
 (define-module (gnucash report stylesheet-footer))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

gnucash/report/stylesheets/stylesheet-head-or-tail.scm

@@ -35,7 +35,7 @@
 
 (define-module (gnucash report stylesheet-head-or-tail))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash core-utils)) ; for gnc:version
 (use-modules (gnucash gettext))

gnucash/report/stylesheets/stylesheet-plain.scm

@@ -24,7 +24,7 @@
 
 (define-module (gnucash report stylesheet-plain))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash core-utils))
 (use-modules (gnucash gettext))

gnucash/report/stylesheets/stylesheets.scm

@@ -26,7 +26,7 @@
 
 (define-module (gnucash report stylesheets))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash report stylesheet-plain))
 (use-modules (gnucash report stylesheet-fancy))
 (use-modules (gnucash report stylesheet-footer))

gnucash/report/utility-reports/hello-world.scm

@@ -24,7 +24,7 @@
 ;; new reports for GnuCash.
 
 (define-module (gnucash report hello-world))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

gnucash/report/utility-reports/test-graphing.scm

@@ -24,7 +24,7 @@
 ;; new reports for GnuCash.
 
 (define-module (gnucash report test-graphing))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 
 (debug-enable 'backtrace)

gnucash/report/utility-reports/utility-reports.scm

@@ -26,7 +26,7 @@
 
 (define-module (gnucash report utility-reports))
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash report hello-world))
 (use-modules (gnucash report view-column))
 (use-modules (gnucash report welcome-to-gnucash))

gnucash/report/utility-reports/view-column.scm

@@ -27,7 +27,7 @@
 ;; don't have to worry about that here.
 
 (define-module (gnucash report view-column))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash app-utils))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))

gnucash/report/utility-reports/welcome-to-gnucash.scm

@@ -23,7 +23,7 @@
 (define-module (gnucash report welcome-to-gnucash))
 (export gnc:make-welcome-report)
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash core-utils)) ; for gnc:version
 (use-modules (gnucash gettext))
 (use-modules (gnucash gnc-module))

libgnucash/app-utils/app-utils.scm

@@ -21,7 +21,7 @@
       (load-extension "libgncmod-app-utils" "scm_init_sw_app_utils_module"))
 (use-modules (sw_app_utils))
 (use-modules (srfi srfi-1))
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 

libgnucash/app-utils/business-options.scm

@@ -24,7 +24,7 @@
 ;; invoice pointers may be used to set the value of the option. The
 ;; option always returns a single invoice pointer.
 
-(use-modules (gnucash main))
+(use-modules (gnucash utilities))
 
 (define (gnc:make-invoice-option
 	 section

libgnucash/app-utils/migrate-prefs.scm

@@ -29,7 +29,7 @@
 
 (define-module (migrate-prefs))
 
-(use-modules (gnucash main))
+(use-modules (gnucash utilities))
 
 (define gconf-dir "")
 (define prefix-length 0)

libgnucash/scm/CMakeLists.txt

@@ -1,5 +1,5 @@
 SET(GUILE_DEPENDS      scm-core-utils scm-gnc-module)
-SET(scm_scm_1_SCHEME   printf.scm string.scm main.scm)
+SET(scm_scm_1_SCHEME   printf.scm string.scm utilities.scm)
 
 
 GNC_ADD_SCHEME_TARGETS(scm-scm-1

libgnucash/scm/price-quotes.scm

@@ -25,7 +25,7 @@
 (export gnc:book-add-quotes) ;; called from gnome/dialog-price-edit-db.c
 (export gnc:price-quotes-install-sources)
 
-(use-modules (gnucash main)) 
+(use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash core-utils))
 (use-modules (srfi srfi-1))

libgnucash/scm/utilities.scm

@@ -15,7 +15,7 @@
 ;; 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 
-(define-module (gnucash main))
+(define-module (gnucash utilities))
 
 ;; Turn off the scheme compiler's "possibly unbound variable" warnings.
 ;; In guile 2.0 we get nearly 7500 of them loading the scheme files.
@@ -34,15 +34,10 @@
 
 (use-modules (gnucash gnc-module))
 
-;; files we can load from the top-level because they're "well behaved"
-;; (these should probably be in modules eventually)
-(load-from-path "string")
-(load-from-path "fin")
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Exports
 
-;; from main.scm
+;; from utilities.scm
 (export gnc:warn)
 (export gnc:error)
 (export gnc:msg)

po/POTFILES.in

@@ -693,10 +693,10 @@ libgnucash/engine/TransLog.c
 libgnucash/gnc-module/example/gncmod-example.c
 libgnucash/gnc-module/gnc-module.c
 libgnucash/gnc-module/gnc-module.scm
-libgnucash/scm/main.scm
 libgnucash/scm/price-quotes.scm
 libgnucash/scm/printf.scm
 libgnucash/scm/string.scm
+libgnucash/scm/utilities.scm
 libgnucash/tax/us/de_DE.scm
 libgnucash/tax/us/gncmod-tax-us.c
 libgnucash/tax/us/txf-de_DE.scm