From 89252d86778da3c962cb2e438ecb190e23aac05b Mon Sep 17 00:00:00 2001 From: Chris Shoemaker Date: Mon, 23 Jan 2006 00:46:22 +0000 Subject: [PATCH] Remove processing of share-path from guile. This is now handled by Gnome's gnome_program_locate_file() function. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12943 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/scm/command-line.scm | 30 +----------------------------- src/scm/main.scm | 1 - src/scm/price-quotes.scm | 6 ++---- 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/src/scm/command-line.scm b/src/scm/command-line.scm index cfe2ba4077..829ad59f78 100644 --- a/src/scm/command-line.scm +++ b/src/scm/command-line.scm @@ -25,7 +25,6 @@ (define gnc:*arg-no-file* #f) (define gnc:*loglevel* #f) -(define gnc:*share-path* #f) (define gnc:*doc-path* #f) (define (gnc:expand-path new-list current-list default-generator) @@ -101,16 +100,7 @@ (N_ "Logging level from 0 (least logging) to 5 (most logging).") (lambda (var value) (if (exact? value) (list value) #f)) eq? - #f)) - - (set! gnc:*share-path* - (gnc:make-path-config-var - (N_ "List of directories to search when looking for shared data files. \ -Each element must be a string representing a directory or a symbol \ -where 'default expands to the default path, and 'current expands to \ -the current value of the path.") - (lambda () gnc:_install-share-path_))) - + #f)) (set! gnc:*doc-path* (gnc:make-path-config-var @@ -126,11 +116,6 @@ the current value of the path.") ;; Now handle any envt var overrides. - (and-let* ((envdir (getenv "GNC_SHARE_PATH")) - (data (gnc:read-from-string envdir)) - ((list? data))) - (gnc:config-var-value-set! gnc:*share-path* #f (gnc:flatten data))) - (and-let* ((envdir (getenv "GNC_DOC_PATH")) (data (gnc:read-from-string envdir)) ((list? data))) @@ -172,19 +157,6 @@ the current value of the path.") #f (N_ "Do not load the last file opened")) - (list "share-path" - 'string - (lambda (val) - (gnc:debug "parsing --share-path " val) - (let ((path-list (gnc:read-from-string val))) - (if (list? path-list) - (gnc:config-var-value-set! gnc:*share-path* #f path-list) - (begin - (gnc:error "non-list given for --share-path: " val) - (gnc:shutdown 1))))) - "SHAREPATH" - (N_ "Set shared data file search path")) - (list "doc-path" 'string (lambda (val) diff --git a/src/scm/main.scm b/src/scm/main.scm index ffd9b11cfc..553241fc54 100644 --- a/src/scm/main.scm +++ b/src/scm/main.scm @@ -63,7 +63,6 @@ (re-export string-split) ;; from command-line.scm -(export gnc:*share-path*) (export gnc:*doc-path*) ;; from doc.scm diff --git a/src/scm/price-quotes.scm b/src/scm/price-quotes.scm index 8cc5fe369a..f34cd9ae58 100644 --- a/src/scm/price-quotes.scm +++ b/src/scm/price-quotes.scm @@ -214,8 +214,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define gnc:*finance-quote-check* - (gnc:find-file "finance-quote-check" - (gnc:config-var-value-get gnc:*share-path*))) + (gnc:gnome-locate-data-file "finance-quote-check")) (define (gnc:fq-check-sources) (let ((program #f)) @@ -263,8 +262,7 @@ ;; src/engine/gnc-pricedb.h (define gnc:*finance-quote-helper* - (gnc:find-file "finance-quote-helper" - (gnc:config-var-value-get gnc:*share-path*))) + (gnc:gnome-locate-data-file "finance-quote-helper")) (define (gnc:fq-get-quotes requests) ;; requests should be a list where each item is of the form