r22638 - gnucash/trunk/src - Eliminate use of gnc:find-file
Geert Janssens
gjanssens at code.gnucash.org
Wed Dec 12 12:42:33 EST 2012
Author: gjanssens
Date: 2012-12-12 12:42:33 -0500 (Wed, 12 Dec 2012)
New Revision: 22638
Trac: http://svn.gnucash.org/trac/changeset/22638
Modified:
gnucash/trunk/src/core-utils/core-utils.i
gnucash/trunk/src/core-utils/core-utils.scm
gnucash/trunk/src/report/report-system/html-jqplot.scm
Log:
Eliminate use of gnc:find-file
Modified: gnucash/trunk/src/core-utils/core-utils.i
===================================================================
--- gnucash/trunk/src/core-utils/core-utils.i 2012-12-12 17:42:22 UTC (rev 22637)
+++ gnucash/trunk/src/core-utils/core-utils.i 2012-12-12 17:42:33 UTC (rev 22638)
@@ -33,6 +33,9 @@
%newobject gnc_path_get_stdreportsdir;
gchar * gnc_path_get_stdreportsdir(void);
+%newobject gnc_path_find_localized_html_file;
+gchar * gnc_path_find_localized_html_file(const gchar *);
+
gchar * gnc_build_dotgnucash_path(const gchar *);
gchar * gnc_build_report_path(const gchar *);
gchar * gnc_build_stdreports_path(const gchar *);
Modified: gnucash/trunk/src/core-utils/core-utils.scm
===================================================================
--- gnucash/trunk/src/core-utils/core-utils.scm 2012-12-12 17:42:22 UTC (rev 22637)
+++ gnucash/trunk/src/core-utils/core-utils.scm 2012-12-12 17:42:33 UTC (rev 22638)
@@ -12,6 +12,7 @@
(re-export gnc-is-debugging)
(re-export gnc-path-get-bindir)
(re-export gnc-path-get-stdreportsdir)
+(re-export gnc-path-find-localized-html-file)
(re-export gnc-build-dotgnucash-path)
(re-export gnc-build-report-path)
(re-export gnc-build-stdreports-path)
Modified: gnucash/trunk/src/report/report-system/html-jqplot.scm
===================================================================
--- gnucash/trunk/src/report/report-system/html-jqplot.scm 2012-12-12 17:42:22 UTC (rev 22637)
+++ gnucash/trunk/src/report/report-system/html-jqplot.scm 2012-12-12 17:42:33 UTC (rev 22638)
@@ -1,16 +1,16 @@
-(load-from-path "doc.scm")
+(use-modules (gnucash core-utils))
(define (gnc:html-js-include file)
(string-append
"<script language=\"javascript\" type=\"text/javascript\" src=\""
- (gnc:find-file file (gnc:config-var-value-get gnc:*doc-path*))
+ (gnc-path-find-localized-html-file file)
"\"></script>\n"
))
(define (gnc:html-css-include file)
(string-append
"<link rel=\"stylesheet\" type=\"text/css\" href=\""
- (gnc:find-file file (gnc:config-var-value-get gnc:*doc-path*))
+ (gnc-path-find-localized-html-file file)
"\" />\n"
))
More information about the gnucash-changes
mailing list