IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Minor renaming and reordering for clarity in gnc_split_register_load().

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14613 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Chris Shoemaker 2006-08-08 22:52:37 +00:00
parent 6ff63efa19
commit 6628b183d7
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/register/ledger-core/split-register-load.c
View File

@ -270,7 +270,7 @@ gnc_split_register_load (SplitRegister *reg, GList * slist,
/* figure out where we are going to. */ /* figure out where we are going to. */
if (info->traverse_to_new) if (info->traverse_to_new)
{ {
find_trans = xaccSplitGetParent (blank_split); find_trans = blank_trans;
find_split = NULL; find_split = NULL;
find_trans_split = blank_split; find_trans_split = blank_split;
} }
@ -355,9 +355,6 @@ gnc_split_register_load (SplitRegister *reg, GList * slist,
table->model->dividing_row = -1; table->model->dividing_row = -1;
if (multi_line)
trans_table = g_hash_table_new (g_direct_hash, g_direct_equal);
// Ensure that the transaction and splits being edited are in the split // Ensure that the transaction and splits being edited are in the split
// list we're about to load. // list we're about to load.
if (pending_trans != NULL) if (pending_trans != NULL)
@ -382,6 +379,9 @@ gnc_split_register_load (SplitRegister *reg, GList * slist,
} }
} }
if (multi_line)
trans_table = g_hash_table_new (g_direct_hash, g_direct_equal);
/* populate the table */ /* populate the table */
for (node = slist; node; node = node->next) for (node = slist; node; node = node->next)
{ {
@ -443,17 +443,28 @@ gnc_split_register_load (SplitRegister *reg, GList * slist,
g_hash_table_destroy (trans_table); g_hash_table_destroy (trans_table);
/* add the blank split at the end. */ /* add the blank split at the end. */
split = blank_split; if (pending_trans == blank_trans)
trans = xaccSplitGetParent (split);
if (pending_trans == trans)
found_pending = TRUE; found_pending = TRUE;
if (trans == find_trans) if (blank_trans == find_trans)
new_trans_row = vcell_loc.virt_row; new_trans_row = vcell_loc.virt_row;
if (split == find_trans_split) if (blank_split == find_trans_split)
new_trans_split_row = vcell_loc.virt_row; new_trans_split_row = vcell_loc.virt_row;
/* If we didn't find the pending transaction, it was removed
* from the account. */
if (!found_pending)
{
info->pending_trans_guid = *guid_null ();
if (xaccTransIsOpen (pending_trans))
xaccTransCommitEdit (pending_trans);
else if (pending_trans)
g_assert_not_reached();
pending_trans = NULL;
}
/* go to blank on first pass */ /* go to blank on first pass */
if (info->first_pass) if (info->first_pass)
{ {
@ -466,7 +477,7 @@ gnc_split_register_load (SplitRegister *reg, GList * slist,
save_loc.phys_col_offset = 0; save_loc.phys_col_offset = 0;
} }
gnc_split_register_add_transaction (reg, trans, split, gnc_split_register_add_transaction (reg, blank_trans, blank_split,
lead_cursor, split_cursor, lead_cursor, split_cursor,
multi_line, start_primary_color, multi_line, start_primary_color,
info->blank_split_edited, find_trans, info->blank_split_edited, find_trans,
@ -524,19 +535,6 @@ gnc_split_register_load (SplitRegister *reg, GList * slist,
cursor_buffer = NULL; cursor_buffer = NULL;
} }
/* If we didn't find the pending transaction, it was removed
* from the account. */
if (!found_pending)
{
info->pending_trans_guid = *guid_null ();
if (xaccTransIsOpen (pending_trans))
xaccTransCommitEdit (pending_trans);
else if (pending_trans)
g_assert_not_reached();
pending_trans = NULL;
}
/* Set up the hint transaction, split, transaction split, and column. */ /* Set up the hint transaction, split, transaction split, and column. */
info->cursor_hint_trans = gnc_split_register_get_current_trans (reg); info->cursor_hint_trans = gnc_split_register_get_current_trans (reg);
info->cursor_hint_split = gnc_split_register_get_current_split (reg); info->cursor_hint_split = gnc_split_register_get_current_split (reg);