From cec7bb732c5b4977467eb54703cf7628390845e5 Mon Sep 17 00:00:00 2001
From: Chris Shoemaker <c.shoemaker@cox.net>
Date: Sun, 26 Feb 2006 18:36:05 +0000
Subject: [PATCH]    Use function version of QOF_COMMIT_EDIT_PART2.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13395 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/business/business-core/gncBillTerm.c | 2 +-
 src/business/business-core/gncCustomer.c | 2 +-
 src/business/business-core/gncEmployee.c | 2 +-
 src/business/business-core/gncEntry.c    | 2 +-
 src/business/business-core/gncInvoice.c  | 2 +-
 src/business/business-core/gncJob.c      | 2 +-
 src/business/business-core/gncOrder.c    | 2 +-
 src/business/business-core/gncTaxTable.c | 2 +-
 src/business/business-core/gncVendor.c   | 2 +-
 src/engine/Account.c                     | 5 ++---
 src/engine/gnc-pricedb.c                 | 4 ++--
 11 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/business/business-core/gncBillTerm.c b/src/business/business-core/gncBillTerm.c
index 28a52f2225..807eed93d3 100644
--- a/src/business/business-core/gncBillTerm.c
+++ b/src/business/business-core/gncBillTerm.c
@@ -418,7 +418,7 @@ static inline void on_done (QofInstance *inst) {}
 void gncBillTermCommitEdit (GncBillTerm *term)
 {
   QOF_COMMIT_EDIT_PART1 (&term->inst);
-  QOF_COMMIT_EDIT_PART2 (&term->inst, gncBillTermOnError,
+  qof_commit_edit_part2 (&term->inst, gncBillTermOnError,
                          on_done, bill_free);
 }
 
diff --git a/src/business/business-core/gncCustomer.c b/src/business/business-core/gncCustomer.c
index 5692751521..350cb8c798 100644
--- a/src/business/business-core/gncCustomer.c
+++ b/src/business/business-core/gncCustomer.c
@@ -387,7 +387,7 @@ static inline void cust_free (QofInstance *inst)
 void gncCustomerCommitEdit (GncCustomer *cust)
 {
   QOF_COMMIT_EDIT_PART1 (&cust->inst);
-  QOF_COMMIT_EDIT_PART2 (&cust->inst, gncCustomerOnError,
+  qof_commit_edit_part2 (&cust->inst, gncCustomerOnError,
                          gncCustomerOnDone, cust_free);
 }
 
diff --git a/src/business/business-core/gncEmployee.c b/src/business/business-core/gncEmployee.c
index 2bbfbdcf35..12298b62c1 100644
--- a/src/business/business-core/gncEmployee.c
+++ b/src/business/business-core/gncEmployee.c
@@ -366,7 +366,7 @@ static inline void emp_free (QofInstance *inst)
 void gncEmployeeCommitEdit (GncEmployee *employee)
 {
   QOF_COMMIT_EDIT_PART1 (&employee->inst);
-  QOF_COMMIT_EDIT_PART2 (&employee->inst, gncEmployeeOnError,
+  qof_commit_edit_part2 (&employee->inst, gncEmployeeOnError,
                          gncEmployeeOnDone, emp_free);
 }
 
diff --git a/src/business/business-core/gncEntry.c b/src/business/business-core/gncEntry.c
index f1f71a2723..2a4807380c 100644
--- a/src/business/business-core/gncEntry.c
+++ b/src/business/business-core/gncEntry.c
@@ -1174,7 +1174,7 @@ static inline void entry_free (QofInstance *inst)
 void gncEntryCommitEdit (GncEntry *entry)
 {
   QOF_COMMIT_EDIT_PART1 (&entry->inst);
-  QOF_COMMIT_EDIT_PART2 (&entry->inst, gncEntryOnError,
+  qof_commit_edit_part2 (&entry->inst, gncEntryOnError,
 			 gncEntryOnDone, entry_free);
 }
 
diff --git a/src/business/business-core/gncInvoice.c b/src/business/business-core/gncInvoice.c
index 2a720e8a84..9af0c3cd63 100644
--- a/src/business/business-core/gncInvoice.c
+++ b/src/business/business-core/gncInvoice.c
@@ -1423,7 +1423,7 @@ static inline void invoice_free (QofInstance *inst)
 void gncInvoiceCommitEdit (GncInvoice *invoice)
 {
   QOF_COMMIT_EDIT_PART1 (&invoice->inst);
-  QOF_COMMIT_EDIT_PART2 (&invoice->inst, gncInvoiceOnError,
+  qof_commit_edit_part2 (&invoice->inst, gncInvoiceOnError,
 			 gncInvoiceOnDone, invoice_free);
 }
 
diff --git a/src/business/business-core/gncJob.c b/src/business/business-core/gncJob.c
index 7ceb70c131..0b6067a708 100644
--- a/src/business/business-core/gncJob.c
+++ b/src/business/business-core/gncJob.c
@@ -279,7 +279,7 @@ static inline void gncJobOnDone (QofInstance *qof) { }
 void gncJobCommitEdit (GncJob *job)
 {
   QOF_COMMIT_EDIT_PART1 (&job->inst);
-  QOF_COMMIT_EDIT_PART2 (&job->inst, gncJobOnError,
+  qof_commit_edit_part2 (&job->inst, gncJobOnError,
                          gncJobOnDone, job_free);
 }
 
diff --git a/src/business/business-core/gncOrder.c b/src/business/business-core/gncOrder.c
index 3bc437713f..70b4bd0881 100644
--- a/src/business/business-core/gncOrder.c
+++ b/src/business/business-core/gncOrder.c
@@ -353,7 +353,7 @@ static inline void order_free (QofInstance *inst)
 void gncOrderCommitEdit (GncOrder *order)
 {
   QOF_COMMIT_EDIT_PART1 (&order->inst);
-  QOF_COMMIT_EDIT_PART2 (&order->inst, gncOrderOnError,
+  qof_commit_edit_part2 (&order->inst, gncOrderOnError,
 			 gncOrderOnDone, order_free);
 }
 
diff --git a/src/business/business-core/gncTaxTable.c b/src/business/business-core/gncTaxTable.c
index b84cbca49f..08b4611fde 100644
--- a/src/business/business-core/gncTaxTable.c
+++ b/src/business/business-core/gncTaxTable.c
@@ -525,7 +525,7 @@ static inline void table_free (QofInstance *inst)
 void gncTaxTableCommitEdit (GncTaxTable *table)
 {
   QOF_COMMIT_EDIT_PART1 (&table->inst);
-  QOF_COMMIT_EDIT_PART2 (&table->inst, gncTaxTableOnError,
+  qof_commit_edit_part2 (&table->inst, gncTaxTableOnError,
                          gncTaxTableOnDone, table_free);
 }
 
diff --git a/src/business/business-core/gncVendor.c b/src/business/business-core/gncVendor.c
index baa4da6586..32dd8756e2 100644
--- a/src/business/business-core/gncVendor.c
+++ b/src/business/business-core/gncVendor.c
@@ -443,7 +443,7 @@ static inline void vendor_free (QofInstance *inst)
 void gncVendorCommitEdit (GncVendor *vendor)
 {
   QOF_COMMIT_EDIT_PART1 (&vendor->inst);
-  QOF_COMMIT_EDIT_PART2 (&vendor->inst, gncVendorOnError,
+  qof_commit_edit_part2 (&vendor->inst, gncVendorOnError,
                          gncVendorOnDone, vendor_free);
 }
 
diff --git a/src/engine/Account.c b/src/engine/Account.c
index 0ab05e93a1..838a514ad1 100644
--- a/src/engine/Account.c
+++ b/src/engine/Account.c
@@ -342,9 +342,8 @@ xaccAccountCommitEdit (Account *acc)
     xaccGroupInsertAccount(acc->parent, acc); 
   }
 
-  QOF_COMMIT_EDIT_PART2 (&acc->inst, on_err, noop, acc_free);
-
-  gnc_engine_gen_event (&acc->inst.entity, GNC_EVENT_MODIFY);
+  if (qof_commit_edit_part2(&acc->inst, on_err, noop, acc_free))
+      gnc_engine_gen_event (&acc->inst.entity, GNC_EVENT_MODIFY);
 }
 
 void 
diff --git a/src/engine/gnc-pricedb.c b/src/engine/gnc-pricedb.c
index a81156e995..e16228f79f 100644
--- a/src/engine/gnc-pricedb.c
+++ b/src/engine/gnc-pricedb.c
@@ -152,7 +152,7 @@ void
 gnc_price_commit_edit (GNCPrice *p)
 {
   QOF_COMMIT_EDIT_PART1 (&p->inst);
-  QOF_COMMIT_EDIT_PART2 (&p->inst, commit_err, noop, noop);
+  qof_commit_edit_part2 (&p->inst, commit_err, noop, noop);
 }
 
 /* ==================================================================== */
@@ -167,7 +167,7 @@ void
 gnc_pricedb_commit_edit (GNCPriceDB *pdb)
 {
   QOF_COMMIT_EDIT_PART1 (&pdb->inst);
-  QOF_COMMIT_EDIT_PART2 (&pdb->inst, commit_err, noop, noop);
+  qof_commit_edit_part2 (&pdb->inst, commit_err, noop, noop);
 }
 
 /* ==================================================================== */