r14959 - gnucash/branches/swig-redo/src/import-export/qif-import - Rename wrapped functions in the gnome module to their swig-names.

[Chris Shoemaker]

Author: chris
Date: 2006-10-09 19:54:11 -0400 (Mon, 09 Oct 2006)
New Revision: 14959
Trac: http://svn.gnucash.org/trac/changeset/14959

Modified:
   gnucash/branches/swig-redo/src/import-export/qif-import/qif-file.scm
   gnucash/branches/swig-redo/src/import-export/qif-import/qif-import.scm
   gnucash/branches/swig-redo/src/import-export/qif-import/qif-merge-groups.scm
   gnucash/branches/swig-redo/src/import-export/qif-import/qif-to-gnc.scm
Log:
Rename wrapped functions in the gnome module to their swig-names.
  gnc-progress-dialog-new
  gnc-progress-dialog-set-title
  gnc-progress-dialog-set-heading
  gnc-progress-dialog-set-value
  gnc-progress-dialog-update
  gnc-progress-dialog-destroy

Also, we have to load the swig module directly from guile in one case,
because our gnome module isn't actually a gnucash module.  Go figure.



Modified: gnucash/branches/swig-redo/src/import-export/qif-import/qif-file.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/qif-file.scm	2006-10-09 23:53:40 UTC (rev 14958)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/qif-file.scm	2006-10-09 23:54:11 UTC (rev 14959)
@@ -53,9 +53,9 @@
 
      (if (> file-size 10000)
          (begin
-           (set! progress-dialog (gnc:progress-dialog-new window #f))
-           (gnc:progress-dialog-set-title progress-dialog (_ "Progress"))
-           (gnc:progress-dialog-set-heading progress-dialog
+           (set! progress-dialog (gnc-progress-dialog-new window #f))
+           (gnc-progress-dialog-set-title progress-dialog (_ "Progress"))
+           (gnc-progress-dialog-set-heading progress-dialog
                                             (_ "Loading QIF file..."))))
 
      (with-input-from-file path
@@ -388,9 +388,9 @@
 		 ;; update the progress bar for each line read
 		 (if progress-dialog 
 		     (begin 
-		       (gnc:progress-dialog-set-value 
+		       (gnc-progress-dialog-set-value
 			progress-dialog (/ bytes-read file-size))
-		       (gnc:progress-dialog-update progress-dialog)))
+		       (gnc-progress-dialog-update progress-dialog)))
                  
                  ;; this is if we read a normal (non-null, non-eof) line...
                  (if (not heinous-error)
@@ -406,7 +406,7 @@
      (qif-file:set-xtns! self (reverse (qif-file:xtns self)))
 
      (if progress-dialog
-         (gnc:progress-dialog-destroy progress-dialog))
+         (gnc-progress-dialog-destroy progress-dialog))
 
      return-val)))
 

Modified: gnucash/branches/swig-redo/src/import-export/qif-import/qif-import.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/qif-import.scm	2006-10-09 23:53:40 UTC (rev 14958)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/qif-import.scm	2006-10-09 23:54:11 UTC (rev 14959)
@@ -7,6 +7,9 @@
 
 (define-module (gnucash import-export qif-import))
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
+
+;; We do this initialization here because src/gnome isn't a real module.
+(load-extension "libgncgnome.so" "scm_init_sw_gnome_module")
 (use-modules (sw_gnome))
 
 (use-modules (gnucash gnc-module))

Modified: gnucash/branches/swig-redo/src/import-export/qif-import/qif-merge-groups.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/qif-merge-groups.scm	2006-10-09 23:53:40 UTC (rev 14958)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/qif-merge-groups.scm	2006-10-09 23:54:11 UTC (rev 14959)
@@ -42,9 +42,9 @@
     
     (if (> work-to-do 100)
 	(begin 
-	  (set! progress-dialog (gnc:progress-dialog-new window #f))
-	  (gnc:progress-dialog-set-title progress-dialog (_ "Progress"))
-	  (gnc:progress-dialog-set-heading progress-dialog
+	  (set! progress-dialog (gnc-progress-dialog-new window #f))
+	  (gnc-progress-dialog-set-title progress-dialog (_ "Progress"))
+	  (gnc-progress-dialog-set-heading progress-dialog
 					   (_ "Finding duplicate transactions..."))))
 
     ;; for each transaction in the new group, build a query that could
@@ -55,9 +55,9 @@
 	 (set! work-done (+ 1 work-done))
 	 (if progress-dialog 
 	     (begin 
-	       (gnc:progress-dialog-set-value 
+	       (gnc-progress-dialog-set-value
 		progress-dialog (/ work-done work-to-do))
-	       (gnc:progress-dialog-update progress-dialog))) 
+	       (gnc-progress-dialog-update progress-dialog)))
 
 	 (gnc:query-set-book query (gnc:group-get-book old-group))
 
@@ -133,7 +133,7 @@
     
     ;; get rid of the progress dialog 
     (if progress-dialog
-	(gnc:progress-dialog-destroy progress-dialog))
+	(gnc-progress-dialog-destroy progress-dialog))
 
     ;; return the matches 
     matches))

Modified: gnucash/branches/swig-redo/src/import-export/qif-import/qif-to-gnc.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/qif-to-gnc.scm	2006-10-09 23:53:40 UTC (rev 14958)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/qif-to-gnc.scm	2006-10-09 23:54:11 UTC (rev 14959)
@@ -296,9 +296,9 @@
        
        (if (> work-to-do 100)
            (begin 
-             (set! progress-dialog (gnc:progress-dialog-new window #f))
-             (gnc:progress-dialog-set-title progress-dialog (_ "Progress"))
-             (gnc:progress-dialog-set-heading progress-dialog
+             (set! progress-dialog (gnc-progress-dialog-new window #f))
+             (gnc-progress-dialog-set-title progress-dialog (_ "Progress"))
+             (gnc-progress-dialog-set-heading progress-dialog
                                               (_ "Importing transactions..."))))
        
 
@@ -310,9 +310,9 @@
              (set! work-done (+ 1 work-done))
              (if progress-dialog 
                  (begin 
-                   (gnc:progress-dialog-set-value 
+                   (gnc-progress-dialog-set-value
                     progress-dialog (/ work-done work-to-do))
-                   (gnc:progress-dialog-update progress-dialog))) 
+                   (gnc-progress-dialog-update progress-dialog)))
              (if (not (qif-xtn:mark xtn))
                  (qif-import:mark-matching-xtns xtn rest))
              (if (not (null? (cdr rest)))
@@ -327,9 +327,9 @@
              (set! work-done (+ 1 work-done))
              (if progress-dialog 
                  (begin 
-                   (gnc:progress-dialog-set-value 
+                   (gnc-progress-dialog-set-value
                     progress-dialog (/ work-done work-to-do))
-                   (gnc:progress-dialog-update progress-dialog))) 
+                   (gnc-progress-dialog-update progress-dialog)))
              (if (not (qif-xtn:mark xtn))
                  (begin 
                    ;; create and fill in the GNC transaction
@@ -353,7 +353,7 @@
        
        ;; get rid of the progress dialog 
        (if progress-dialog
-           (gnc:progress-dialog-destroy progress-dialog))
+           (gnc-progress-dialog-destroy progress-dialog))
        
        new-group))))