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

Revert r14591 (bug 344966) to prepare another solution.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14893 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Andreas Köhler 2006-09-26 22:07:42 +00:00
parent 2bb357def4
commit c77679c601
2 changed files with 8 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -179,9 +179,6 @@
* various: Unref all new stores.
* src/gnome-utils/dialog-account.c: Check for account type
compatibility when creating a new account. Fixes 344966.
* src/core-utils/gnc-gtk-utils.c: Unref entry completion, inline
completion only for gtk>=2.6.

51
src/gnome-utils/dialog-account.c
View File

@ -497,8 +497,8 @@ gnc_finish_ok (AccountWindow *aw,
/* Record all of the children of the given account as needing their
* type changed to the one specified. */
static void
gnc_change_account_types(GHashTable *change_type, Account *account,
Account *except, GNCAccountType type)
gnc_edit_change_account_types(GHashTable *change_type, Account *account,
Account *except, GNCAccountType type)
{
AccountGroup *children;
GList *list;
@ -521,7 +521,7 @@ gnc_change_account_types(GHashTable *change_type, Account *account,
for (node= list; node; node = node->next)
{
account = node->data;
gnc_change_account_types(change_type, account, except, type);
gnc_edit_change_account_types(change_type, account, except, type);
}
}
@ -640,7 +640,8 @@ extra_change_verify (AccountWindow *aw,
store = gtk_list_store_new(NUM_ACCOUNT_COLS, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING);
size = fill_list(account, GTK_LIST_STORE(store), change_type);
size = 0;
size += fill_list(account, GTK_LIST_STORE(store), change_type);
if (size == 0)
{
@ -887,7 +888,7 @@ gnc_edit_account_ok(AccountWindow *aw)
change_all = FALSE;
if (change_children)
gnc_change_account_types(change_type, account, NULL, aw->type);
gnc_edit_change_account_types(change_type, account, NULL, aw->type);
if (change_all)
{
@ -902,7 +903,7 @@ gnc_edit_account_ok(AccountWindow *aw)
temp = xaccAccountGetParentAccount(ancestor);
} while (temp != NULL);
gnc_change_account_types(change_type, ancestor, account, aw->type);
gnc_edit_change_account_types(change_type, ancestor, account, aw->type);
}
if (!extra_change_verify(aw, change_type))
@ -927,8 +928,6 @@ static void
gnc_new_account_ok (AccountWindow *aw)
{
gnc_numeric balance;
GHashTable *change_type;
Account *new_parent;
ENTER("aw %p", aw);
@ -972,41 +971,7 @@ gnc_new_account_ok (AccountWindow *aw)
}
}
/* If the new parent's type is not compatible with the new type,
* the whole sub-tree containing the account must be re-typed. */
change_type = g_hash_table_new (NULL, NULL);
new_parent = gnc_tree_view_account_get_selected_account (
GNC_TREE_VIEW_ACCOUNT (aw->parent_tree));
if (new_parent != aw->top_level_account)
{
if (!xaccAccountTypesCompatible (xaccAccountGetType(new_parent),
aw->type))
{
Account *ancestor;
Account *temp;
temp = new_parent;
do
{
ancestor = temp;
temp = xaccAccountGetParentAccount (ancestor);
} while (temp != NULL);
gnc_change_account_types (change_type, ancestor, NULL, aw->type);
if (!extra_change_verify (aw, change_type))
{
g_hash_table_destroy (change_type);
LEAVE(" ");
return;
}
}
}
gnc_finish_ok (aw, change_type);
g_hash_table_destroy (change_type);
gnc_finish_ok (aw, NULL);
LEAVE(" ");
}