From 5c06f7f8c0245fffac95339d0984dbc4c212adfe Mon Sep 17 00:00:00 2001 From: Christopher Lam Date: Wed, 30 Sep 2020 09:50:13 +0800 Subject: [PATCH] deprecate xaccAccountCountSplits with include_children = TRUE where xaccAccountCountSplits is called including children, call gnc_account_and_descendants_empty intead --- gnucash/gnome-utils/gnc-tree-view-account.c | 2 +- gnucash/gnome/dialog-find-account.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnucash/gnome-utils/gnc-tree-view-account.c b/gnucash/gnome-utils/gnc-tree-view-account.c index 8c54631944..f4abff1872 100644 --- a/gnucash/gnome-utils/gnc-tree-view-account.c +++ b/gnucash/gnome-utils/gnc-tree-view-account.c @@ -2046,7 +2046,7 @@ gnc_plugin_page_account_tree_filter_accounts (Account *account, if (!fd->show_unused) { - if (xaccAccountCountSplits(account, TRUE) == 0) + if (gnc_account_and_descendants_empty(account)) { LEAVE(" hide: unused"); return FALSE; diff --git a/gnucash/gnome/dialog-find-account.c b/gnucash/gnome/dialog-find-account.c index 971cfdcf1b..b1da9fd347 100644 --- a/gnucash/gnome/dialog-find-account.c +++ b/gnucash/gnome/dialog-find-account.c @@ -189,7 +189,7 @@ fill_model (GtkTreeModel *model, Account *account) { GtkTreeIter iter; gchar *fullname = gnc_account_get_full_name (account); - gint splits = xaccAccountCountSplits (account, TRUE); + gboolean acc_empty = gnc_account_and_descendants_empty (account); gnc_numeric total = xaccAccountGetBalanceInCurrency (account, NULL, TRUE); PINFO("Add to Store: Account '%s'", fullname); @@ -200,7 +200,7 @@ fill_model (GtkTreeModel *model, Account *account) ACC_FULL_NAME, fullname, ACCOUNT, account, PLACE_HOLDER, (xaccAccountGetPlaceholder (account) == TRUE ? "emblem-default" : NULL), HIDDEN, (xaccAccountGetHidden (account) == TRUE ? "emblem-default" : NULL), - NOT_USED, (splits == 0 ? "emblem-default" : NULL), + NOT_USED, (acc_empty ? "emblem-default" : NULL), BAL_ZERO, (gnc_numeric_zero_p (total) == TRUE ? "emblem-default" : NULL), TAX, (xaccAccountGetTaxRelated (account) == TRUE ? "emblem-default" : NULL), -1); g_free (fullname);