r16484 - gnucash/trunk/src/report/locale-specific/us - Bug#471485: Fix SWIGification string issues.

Christian Stimming cstim at cvs.gnucash.org
Sun Sep 2 15:40:57 EDT 2007


Author: cstim
Date: 2007-09-02 15:40:55 -0400 (Sun, 02 Sep 2007)
New Revision: 16484
Trac: http://svn.gnucash.org/trac/changeset/16484

Modified:
   gnucash/trunk/src/report/locale-specific/us/taxtxf-de_DE.scm
   gnucash/trunk/src/report/locale-specific/us/taxtxf.scm
Log:
Bug#471485: Fix SWIGification string issues.


Modified: gnucash/trunk/src/report/locale-specific/us/taxtxf-de_DE.scm
===================================================================
--- gnucash/trunk/src/report/locale-specific/us/taxtxf-de_DE.scm	2007-09-02 19:40:51 UTC (rev 16483)
+++ gnucash/trunk/src/report/locale-specific/us/taxtxf-de_DE.scm	2007-09-02 19:40:55 UTC (rev 16484)
@@ -197,7 +197,7 @@
 
 (define (gnc:account-get-txf-code account)
   (let ((code (xaccAccountGetTaxUSCode account)))
-    (string->symbol (if code code "N000"))))
+    (string->symbol (if (string-null? code) "N000" code))))
 
 (define (gnc:get-txf-format code income?)
   (gnc:txf-get-format (if income?
@@ -207,7 +207,7 @@
 
 (define (gnc:account-get-txf-payer-source account)
   (let ((pns (xaccAccountGetTaxUSPayerNameSource account)))
-    (string->symbol (if pns pns "keine"))))
+    (string->symbol (if (string-null? pns) "keine" pns))))
 
 ;; check for duplicate txf codes
 (define (txf-check-dups account) 
@@ -318,7 +318,7 @@
 					(gnc-account-get-parent account)
 					account))
 				    (name (xaccAccountGetName named-acct)))
-			       (if name
+			       (if (not (string-null? name))
 				   name
 				   (begin
 				     (display

Modified: gnucash/trunk/src/report/locale-specific/us/taxtxf.scm
===================================================================
--- gnucash/trunk/src/report/locale-specific/us/taxtxf.scm	2007-09-02 19:40:51 UTC (rev 16483)
+++ gnucash/trunk/src/report/locale-specific/us/taxtxf.scm	2007-09-02 19:40:55 UTC (rev 16484)
@@ -181,7 +181,7 @@
 
 (define (gnc:account-get-txf-code account)
   (let ((code (xaccAccountGetTaxUSCode account)))
-    (string->symbol (if code code "N000"))))
+    (string->symbol (if (string-null? code) "N000" code))))
 
 (define (gnc:get-txf-format code income?)
   (gnc:txf-get-format (if income?
@@ -191,7 +191,7 @@
 
 (define (gnc:account-get-txf-payer-source account)
   (let ((pns (xaccAccountGetTaxUSPayerNameSource account)))
-    (string->symbol (if pns pns "none"))))
+    (string->symbol (if (string-null? pns) "none" pns))))
 
 ;; check for duplicate txf codes
 (define (txf-check-dups account) 
@@ -293,7 +293,7 @@
 					(gnc-account-get-parent account)
 					account))
 				    (name (xaccAccountGetName named-acct)))
-			       (if name
+			       (if (not (string-null? name))
 				   name
 				   (begin
 				     (display



More information about the gnucash-changes mailing list