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

CsvTransExp - remove redundant counter num_accounts

Browse Source 
Simply use length of account list instead
This commit is contained in:
Geert Janssens 2023-02-14 17:24:11 +01:00
parent 545f27c550
commit 1d971c1578
3 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gnucash/import-export/csv-exp/assistant-csv-export.c
View File

@ -378,7 +378,7 @@ show_acct_type_accounts (CsvExportInfo *info)
*
* update the account tree
*******************************************************/
static int
static void
update_accounts_tree (CsvExportInfo *info)
{
GncTreeViewAccount *tree;
@ -396,8 +396,6 @@ update_accounts_tree (CsvExportInfo *info)
string = g_strdup_printf ("%d", num_accounts);
gtk_label_set_text (GTK_LABEL (label), string);
g_free (string);
return num_accounts;
}
@ -410,22 +408,22 @@ static void
csv_export_account_changed_cb (GtkTreeSelection *selection,
gpointer user_data)
{
CsvExportInfo *info = user_data;
GtkAssistant *assistant = GTK_ASSISTANT(info->assistant);
GncTreeViewAccount *view;
g_return_if_fail(GTK_IS_TREE_SELECTION(selection));
info->csva.num_accounts = update_accounts_tree (info);
CsvExportInfo *info = user_data;
GncTreeViewAccount *view = GNC_TREE_VIEW_ACCOUNT(info->csva.account_treeview);
info->csva.account_list = gnc_tree_view_account_get_selected_accounts (view);
/* Enable the "Next" Assistant Button if we have accounts */
if (info->csva.num_accounts > 0)
GtkAssistant *assistant = GTK_ASSISTANT(info->assistant);
if (g_list_length (info->csva.account_list) > 0)
gtk_assistant_set_page_complete (assistant, info->account_page, TRUE);
else
gtk_assistant_set_page_complete (assistant, info->account_page, FALSE);
view = GNC_TREE_VIEW_ACCOUNT(info->csva.account_treeview);
info->csva.account_list = gnc_tree_view_account_get_selected_accounts (view);
update_accounts_tree (info);
}
@ -692,7 +690,7 @@ csv_export_assistant_account_page_prepare (GtkAssistant *assistant,
CsvExportInfo *info = user_data;
/* Enable the "Next" Assistant Button if we have accounts */
if (info->csva.num_accounts > 0)
if (g_list_length(info->csva.account_list) > 0)
gtk_assistant_set_page_complete (assistant, info->account_page, TRUE);
else
gtk_assistant_set_page_complete (assistant, info->account_page, FALSE);
@ -730,7 +728,9 @@ csv_export_assistant_finish_page_prepare (GtkAssistant *assistant,
if ((info->export_type == XML_EXPORT_REGISTER) && (info->account == NULL))
text = g_strdup_printf (gettext (finish_trans_search_gl_string), info->file_name);
else
text = g_strdup_printf (gettext (finish_trans_string), info->file_name, info->csva.num_accounts);
text = g_strdup_printf (gettext (finish_trans_string),
info->file_name,
g_list_length (info->csva.account_list));
}
gtk_label_set_text (GTK_LABEL(info->finish_label), text);
g_free (text);
@ -802,6 +802,7 @@ csv_export_assistant_destroy_cb (GtkWidget *object, gpointer user_data)
{
CsvExportInfo *info = user_data;
gnc_unregister_gui_component_by_data (ASSISTANT_CSV_EXPORT_CM_CLASS, info);
g_list_free (info->csva.account_list);
g_free (info);
}
@ -1013,7 +1014,7 @@ gnc_file_csv_export_internal (CsvExportType export_type, Query *q, Account *acc)
if (acc)
info->account = acc;
if ((export_type == XML_EXPORT_REGISTER) && acc)
info->csva.num_accounts = 1;
info->csva.account_list = g_list_prepend(info->csva.account_list, acc);
csv_export_assistant_create (info);
gnc_register_gui_component (ASSISTANT_CSV_EXPORT_CM_CLASS,

1
gnucash/import-export/csv-exp/assistant-csv-export.h
View File

@ -62,7 +62,6 @@ typedef struct
GtkWidget *select_button;
GtkWidget *num_acct_label;
GList *account_list;
int num_accounts;
GNCAccountType account_type;
} CsvExportAcc;

16
gnucash/import-export/csv-exp/csv-transactions-export.c
View File

@ -578,19 +578,13 @@ void csv_transactions_export (CsvExportInfo *info)
if (info->failed)
return;
if (info->export_type == XML_EXPORT_TRANS)
/* Go through list of accounts */
for (GList *ptr = info->csva.account_list; ptr; ptr = g_list_next(ptr))
{
/* Go through list of accounts */
for (GList *ptr = info->csva.account_list; ptr; ptr = g_list_next(ptr))
{
Account *acc = ptr->data;
DEBUG("Account being processed is : %s", xaccAccountGetName (acc));
account_splits (info, acc, fh);
}
g_list_free (info->csva.account_list);
Account *acc = ptr->data;
DEBUG("Account being processed is : %s", xaccAccountGetName (acc));
account_splits (info, acc, fh);
}
else
account_splits (info, info->account, fh);
fclose (fh);
LEAVE("");