[Gnucash-changes] r13777 - gnucash/trunk - Finish cleaning up old
uses of NS_ISO. Use the C is_currency function
David Hampton
hampton at cvs.gnucash.org
Thu Apr 13 23:49:15 EDT 2006
Author: hampton
Date: 2006-04-13 23:49:14 -0400 (Thu, 13 Apr 2006)
New Revision: 13777
Trac: http://svn.gnucash.org/trac/changeset/13777
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/src/app-utils/options.scm
gnucash/trunk/src/engine/commodity-table.scm
gnucash/trunk/src/engine/engine.scm
gnucash/trunk/src/engine/gnc-commodity.c
gnucash/trunk/src/engine/gw-engine-spec.scm
gnucash/trunk/src/gnome-utils/window-main-summarybar.c
gnucash/trunk/src/gnome/dialog-commodities.c
gnucash/trunk/src/import-export/qif-import/qif-to-gnc.scm
Log:
Finish cleaning up old uses of NS_ISO. Use the C is_currency function
for both C and Scheme calls.
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2006-04-14 02:36:00 UTC (rev 13776)
+++ gnucash/trunk/ChangeLog 2006-04-14 03:49:14 UTC (rev 13777)
@@ -1,5 +1,14 @@
2006-04-13 David Hampton <hampton at employees.org>
+ * src/gnome-utils/window-main-summarybar.c:
+ * src/gnome/dialog-commodities.c:
+ * src/engine/engine.scm:
+ * src/engine/commodity-table.scm:
+ * src/engine/gnc-commodity.c:
+ * src/app-utils/options.scm: Finish cleaning up old uses of
+ NS_ISO. Use the C is_currency function for both C and Scheme
+ calls.
+
* src/import-export/qif-import/druid-qif-import.c:
* src/import-export/binary-import/druid-commodity.c:
* src/import-export/ofx/gnc-ofx-import.c:
Modified: gnucash/trunk/src/app-utils/options.scm
===================================================================
--- gnucash/trunk/src/app-utils/options.scm 2006-04-14 02:36:00 UTC (rev 13776)
+++ gnucash/trunk/src/app-utils/options.scm 2006-04-14 03:49:14 UTC (rev 13777)
@@ -362,7 +362,7 @@
(define (commodity->scm commodity)
(if (string? commodity)
(list 'commodity-scm
- GNC_COMMODITY_NS_ISO
+ GNC_COMMODITY_NS_CURRENCY
commodity)
(list 'commodity-scm
(gnc:commodity-get-namespace commodity)
Modified: gnucash/trunk/src/engine/commodity-table.scm
===================================================================
--- gnucash/trunk/src/engine/commodity-table.scm 2006-04-14 02:36:00 UTC (rev 13776)
+++ gnucash/trunk/src/engine/commodity-table.scm 2006-04-14 03:49:14 UTC (rev 13777)
@@ -6,7 +6,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define GNC_COMMODITY_NS_ISO "ISO4217")
+(define GNC_COMMODITY_NS_CURRENCY "CURRENCY")
;; If you change the C side, change this too.
(define GNC_COMMODITY_NS_AMEX "AMEX")
@@ -14,9 +14,3 @@
(define GNC_COMMODITY_NS_NASDAQ "NASDAQ")
(define GNC_COMMODITY_NS_EUREX "EUREX")
(define GNC_COMMODITY_NS_MUTUAL "FUND")
-
-;; Returns true if the commodity comm represents a currency, false if
-;; it represents a stock or mutual-fund.
-(define (gnc:commodity-is-currency? comm)
- (equal? GNC_COMMODITY_NS_ISO
- (gnc:commodity-get-namespace comm)))
Modified: gnucash/trunk/src/engine/engine.scm
===================================================================
--- gnucash/trunk/src/engine/engine.scm 2006-04-14 02:36:00 UTC (rev 13776)
+++ gnucash/trunk/src/engine/engine.scm 2006-04-14 03:49:14 UTC (rev 13777)
@@ -36,13 +36,12 @@
(export gnc:gnc-monetary-amount)
(export gnc:monetary-neg)
-(export GNC_COMMODITY_NS_ISO)
+(export GNC_COMMODITY_NS_CURRENCY)
(export GNC_COMMODITY_NS_NASDAQ)
(export GNC_COMMODITY_NS_NYSE)
(export GNC_COMMODITY_NS_AMEX)
(export GNC_COMMODITY_NS_EUREX)
(export GNC_COMMODITY_NS_MUTUAL)
-(export gnc:commodity-is-currency?)
(export gnc:url->loaded-session)
(export gnc:group-map-all-accounts)
Modified: gnucash/trunk/src/engine/gnc-commodity.c
===================================================================
--- gnucash/trunk/src/engine/gnc-commodity.c 2006-04-14 02:36:00 UTC (rev 13776)
+++ gnucash/trunk/src/engine/gnc-commodity.c 2006-04-14 03:49:14 UTC (rev 13777)
@@ -1080,7 +1080,7 @@
GHashTable *tbl = ((gnc_commodity_namespace*)value)->cm_table;
guint *count = (guint*)user_data;
- if(safe_strcmp((char*)key, GNC_COMMODITY_NS_ISO) == 0)
+ if(safe_strcmp((char*)key, GNC_COMMODITY_NS_CURRENCY) == 0)
{
/* don't count default commodities */
return;
Modified: gnucash/trunk/src/engine/gw-engine-spec.scm
===================================================================
--- gnucash/trunk/src/engine/gw-engine-spec.scm 2006-04-14 02:36:00 UTC (rev 13776)
+++ gnucash/trunk/src/engine/gw-engine-spec.scm 2006-04-14 03:49:14 UTC (rev 13777)
@@ -2104,6 +2104,14 @@
(gw:wrap-function
ws
+ 'gnc:commodity-is-currency?
+ '<gw:bool>
+ "gnc_commodity_is_currency"
+ '((<gnc:commodity*> comm))
+ "return true if the commodity is an ISO4217 currency")
+
+(gw:wrap-function
+ ws
'gnc:commodity-equiv?
'<gw:bool>
"gnc_commodity_equiv"
Modified: gnucash/trunk/src/gnome/dialog-commodities.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-commodities.c 2006-04-14 02:36:00 UTC (rev 13776)
+++ gnucash/trunk/src/gnome/dialog-commodities.c 2006-04-14 03:49:14 UTC (rev 13777)
@@ -81,7 +81,7 @@
gnc_commodity *commodity;
commodity = gnc_tree_view_commodity_get_selected_commodity (cd->commodity_tree);
- if (commodity == NULL || gnc_commodity_is_currency (commodity))
+ if (commodity == NULL)
return;
if (gnc_ui_edit_commodity_modal (commodity, cd->dialog))
Modified: gnucash/trunk/src/gnome-utils/window-main-summarybar.c
===================================================================
--- gnucash/trunk/src/gnome-utils/window-main-summarybar.c 2006-04-14 02:36:00 UTC (rev 13776)
+++ gnucash/trunk/src/gnome-utils/window-main-summarybar.c 2006-04-14 03:49:14 UTC (rev 13777)
@@ -165,8 +165,7 @@
else
euro_commodity = NULL;
- if(safe_strcmp(gnc_commodity_get_namespace(account_currency),
- GNC_COMMODITY_NS_ISO) != 0) {
+ if(!gnc_commodity_is_currency(account_currency)) {
non_currency = TRUE;
non_curr_accum = gnc_ui_get_currency_accumulator(currency_list,
options.default_currency,
Modified: gnucash/trunk/src/import-export/qif-import/qif-to-gnc.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-import/qif-to-gnc.scm 2006-04-14 02:36:00 UTC (rev 13776)
+++ gnucash/trunk/src/import-export/qif-import/qif-to-gnc.scm 2006-04-14 03:49:14 UTC (rev 13777)
@@ -184,7 +184,7 @@
(default-currency
(gnc:commodity-table-find-full
(gnc:book-get-commodity-table (gnc:get-current-book))
- GNC_COMMODITY_NS_COMMODITY default-currency-name))
+ GNC_COMMODITY_NS_CURRENCY default-currency-name))
(sorted-accounts-list '())
(markable-xtns '())
(sorted-qif-files-list
More information about the gnucash-changes
mailing list