r21728 - gnucash/branches/2.4/src/engine - [r21727] Fix "imported from both (sw_engine) and (gnucash engine)"

[John Ralls]

Author: jralls
Date: 2011-12-12 20:00:45 -0500 (Mon, 12 Dec 2011)
New Revision: 21728
Trac: http://svn.gnucash.org/trac/changeset/21728

Modified:
   gnucash/branches/2.4/src/engine/engine.i
Log:
[r21727] Fix "imported from both (sw_engine) and (gnucash engine)"
errors from Guile

The GncNumericErrorCode enums are re-defined in
src/engine/gnc-numeric.scm -- the SWIG way of representing them produces
type errors in the report code. This may well be a problem with the
calling code, but it's easier at this point to just not import the
symbols into sw_engine.

gnc_commodity_table_get_quotable_commodities is explicitly wrapped in
app-utils.i, so we need to not have the default wrapper in sw_engine.

Modified: gnucash/branches/2.4/src/engine/engine.i
===================================================================
--- gnucash/branches/2.4/src/engine/engine.i	2011-12-12 22:42:14 UTC (rev 21727)
+++ gnucash/branches/2.4/src/engine/engine.i	2011-12-13 01:00:45 UTC (rev 21728)
@@ -116,7 +116,13 @@
 %include <qofbook.h>
 
 KvpFrame* qof_book_get_slots(QofBook* book);
-
+%ignore GNC_DENOM_AUTO;
+%ignore GNCNumericErrorCodes;
+%ignore GNC_ERROR_OK;
+%ignore GNC_ERROR_ARG;
+%ignore GNC_ERROR_OVERFLOW;
+%ignore GNC_ERROR_DENOM_DIFF;
+%ignore GNC_ERROR_REMAINDER;
 %include <gnc-numeric.h>
 
 Timespec timespecCanonicalDayTime(Timespec t);
@@ -154,6 +160,7 @@
 void gnc_quote_source_set_fq_installed (GList *sources_list);
 %clear GList *;
 %ignore gnc_quote_source_set_fq_installed;
+%ignore gnc_commodity_table_get_quotable_commodities;
 %include <gnc-commodity.h>
 
 %include <gnc-session-scm.h>