[Gnucash-changes] r12943 - gnucash/trunk/src/scm - Remove processing of share-path from guile.

[Chris Shoemaker]

Author: chris
Date: 2006-01-22 19:46:22 -0500 (Sun, 22 Jan 2006)
New Revision: 12943
Trac: http://svn.gnucash.org/trac/changeset/12943

Modified:
   gnucash/trunk/src/scm/command-line.scm
   gnucash/trunk/src/scm/main.scm
   gnucash/trunk/src/scm/price-quotes.scm
Log:
  Remove processing of share-path from guile.
  This is now handled by Gnome's gnome_program_locate_file() function.


Modified: gnucash/trunk/src/scm/command-line.scm
===================================================================
--- gnucash/trunk/src/scm/command-line.scm	2006-01-22 23:12:15 UTC (rev 12942)
+++ gnucash/trunk/src/scm/command-line.scm	2006-01-23 00:46:22 UTC (rev 12943)
@@ -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 @@
 
   ;; 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 @@
          #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)

Modified: gnucash/trunk/src/scm/main.scm
===================================================================
--- gnucash/trunk/src/scm/main.scm	2006-01-22 23:12:15 UTC (rev 12942)
+++ gnucash/trunk/src/scm/main.scm	2006-01-23 00:46:22 UTC (rev 12943)
@@ -63,7 +63,6 @@
 (re-export string-split)
 
 ;; from command-line.scm
-(export gnc:*share-path*)
 (export gnc:*doc-path*)
 
 ;; from doc.scm

Modified: gnucash/trunk/src/scm/price-quotes.scm
===================================================================
--- gnucash/trunk/src/scm/price-quotes.scm	2006-01-22 23:12:15 UTC (rev 12942)
+++ gnucash/trunk/src/scm/price-quotes.scm	2006-01-23 00:46:22 UTC (rev 12943)
@@ -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