[Gnucash-changes] r13833 - gnucash/trunk/src/register/ledger-core - Remove some unnecessary Begin/Commit blocks around code that is already

[Chris Shoemaker]

Author: chris
Date: 2006-04-23 17:07:55 -0400 (Sun, 23 Apr 2006)
New Revision: 13833
Trac: http://svn.gnucash.org/trac/changeset/13833

Modified:
   gnucash/trunk/src/register/ledger-core/split-register-control.c
   gnucash/trunk/src/register/ledger-core/split-register-p.h
   gnucash/trunk/src/register/ledger-core/split-register.c
Log:
   Remove some unnecessary Begin/Commit blocks around code that is already
   transactional.  
   Convert some Split function calls to the xaccSplit... form.


Modified: gnucash/trunk/src/register/ledger-core/split-register-control.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register-control.c	2006-04-22 20:14:41 UTC (rev 13832)
+++ gnucash/trunk/src/register/ledger-core/split-register-control.c	2006-04-23 21:07:55 UTC (rev 13833)
@@ -276,13 +276,9 @@
       (old_split != new_split) &&
       gnc_split_register_old_split_empty_p(reg, old_split)) 
   {
-    Transaction *t;
     int current_row;
 
-    t = xaccSplitGetParent(old_split);
-    xaccTransBeginEdit (t);
     xaccSplitDestroy(old_split);
-    xaccTransCommitEdit (t);
     old_split = NULL;
 
     /*

Modified: gnucash/trunk/src/register/ledger-core/split-register-p.h
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register-p.h	2006-04-22 20:14:41 UTC (rev 13832)
+++ gnucash/trunk/src/register/ledger-core/split-register-p.h	2006-04-23 21:07:55 UTC (rev 13833)
@@ -101,7 +101,7 @@
   /* flag indicating a template register */
   gboolean template;
 
-  /* The template account which template transaction should below to */
+  /* The template account which template transaction should belong to */
   GUID template_account;
 
   /* configured strings for debit/credit headers */

Modified: gnucash/trunk/src/register/ledger-core/split-register.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register.c	2006-04-22 20:14:41 UTC (rev 13832)
+++ gnucash/trunk/src/register/ledger-core/split-register.c	2006-04-23 21:07:55 UTC (rev 13833)
@@ -436,7 +436,7 @@
     new_split = xaccMallocSplit (gnc_get_current_book ());
 
     xaccTransBeginEdit (trans);
-    xaccTransAppendSplit (trans, new_split);
+    xaccSplitSetParent (new_split, trans);
     gnc_copy_split_onto_split (split, new_split, FALSE);
     xaccTransCommitEdit (trans);
 
@@ -716,16 +716,14 @@
 
     gnc_suspend_gui_refresh ();
 
-    xaccTransBeginEdit(trans);
     if (split == NULL)
     { /* We are on a null split in an expanded transaction. */
       split = xaccMallocSplit(gnc_get_current_book ());
-      xaccTransAppendSplit(trans, split);
+      xaccSplitSetParent(split, trans);
     }
 
     gnc_copy_split_scm_onto_split(copied_item, split,
                                   gnc_get_current_book ());
-    xaccTransCommitEdit(trans);
   }
   else
   {
@@ -834,9 +832,7 @@
 
   account = xaccSplitGetAccount (split);
 
-  xaccTransBeginEdit (trans);
   xaccSplitDestroy (split);
-  xaccTransCommitEdit (trans);
 
   /* Check pending transaction */
   if (trans == pending_trans)
@@ -887,9 +883,7 @@
 
     gnc_suspend_gui_refresh ();
 
-    xaccTransBeginEdit (trans);
     xaccTransDestroy (trans);
-    xaccTransCommitEdit (trans);
 
     info->blank_split_guid = *guid_null();
     blank_split = NULL;
@@ -908,9 +902,7 @@
    * their register windows after the deletion. */
   trans = xaccSplitGetParent(split);
 
-  xaccTransBeginEdit(trans);
   xaccTransDestroy(trans);
-  xaccTransCommitEdit(trans);
 
   /* Check pending transaction */
   if (trans == pending_trans)
@@ -956,10 +948,7 @@
   gnc_suspend_gui_refresh ();
 
   trans = xaccSplitGetParent(split);
-
-  xaccTransBeginEdit(trans);
   xaccTransVoid(trans, reason);
-  xaccTransCommitEdit(trans);
 
   /* Check pending transaction */
   if (trans == pending_trans)
@@ -1006,9 +995,7 @@
 
   trans = xaccSplitGetParent(split);
 
-  xaccTransBeginEdit(trans);
   xaccTransUnvoid(trans);
-  xaccTransCommitEdit(trans);
 
   /* Check pending transaction */
   if (trans == pending_trans)
@@ -1335,7 +1322,7 @@
 
    /* use the changed flag to avoid heavy-weight updates
     * of the split & transaction fields. This will help
-    * cut down on uneccessary register redraws. */
+    * cut down on unnecessary register redraws. */
    if (!gnc_table_current_cursor_changed (reg->table, FALSE))
    {
      if (!do_commit)
@@ -1397,8 +1384,8 @@
    /* If we are committing the blank split, add it to the account now */
    if (trans == blank_trans)
    {
-     xaccAccountInsertSplit (gnc_split_register_get_default_account (reg),
-                             blank_split);
+     xaccSplitSetAccount(blank_split, 
+                         gnc_split_register_get_default_account (reg));
      xaccTransSetDateEnteredSecs(trans, time(NULL));
    }
 
@@ -1927,15 +1914,15 @@
   SRInfo *info = gnc_split_register_get_info (reg);
   Transaction *pending_trans;
 
-  pending_trans = xaccTransLookup (&info->pending_trans_guid,
-                                   gnc_get_current_book ());
-
   if (reg == NULL)
     return FALSE;
 
   if (gnc_table_current_cursor_changed (reg->table, FALSE))
     return TRUE;
 
+  pending_trans = xaccTransLookup (&info->pending_trans_guid,
+                                   gnc_get_current_book ());
+
   return xaccTransIsOpen (pending_trans);
 }
 
@@ -2373,9 +2360,7 @@
         pending_trans = NULL;
       }
 
-      xaccTransBeginEdit (trans);
       xaccTransDestroy (trans);
-      xaccTransCommitEdit (trans);
 
       info->blank_split_guid = *guid_null ();
       blank_split = NULL;