diff --git a/gnucash/gnome/dialog-report-column-view.c b/gnucash/gnome/dialog-report-column-view.c index 4453c10123..88c5925fcc 100644 --- a/gnucash/gnome/dialog-report-column-view.c +++ b/gnucash/gnome/dialog-report-column-view.c @@ -490,11 +490,13 @@ gnc_column_view_edit_add_cb(GtkButton * button, gpointer user_data) oldlist = SCM_CDR(oldlist); } newlist = scm_append - (scm_list_n (scm_reverse(scm_cons(SCM_LIST4(new_report, - scm_from_int (1), - scm_from_int (1), - SCM_BOOL_F), - newlist)), + (scm_list_n (scm_reverse + (scm_cons + (scm_list_4 (new_report, + scm_from_int (1), + scm_from_int (1), + SCM_BOOL_F), + newlist)), oldlist, SCM_UNDEFINED)); } @@ -502,10 +504,11 @@ gnc_column_view_edit_add_cb(GtkButton * button, gpointer user_data) { newlist = scm_append (scm_list_n (oldlist, - SCM_LIST1(SCM_LIST4(new_report, - scm_from_int (1), - scm_from_int (1), - SCM_BOOL_F)), + scm_list_1 + (scm_list_4 (new_report, + scm_from_int (1), + scm_from_int (1), + SCM_BOOL_F)), SCM_UNDEFINED)); r->contents_selected = oldlength; } @@ -680,12 +683,12 @@ gnc_column_view_edit_size_cb(GtkButton * button, gpointer user_data) if (dlg_ret == GTK_RESPONSE_OK) { - current = SCM_LIST4(SCM_CAR(current), - scm_from_int (gtk_spin_button_get_value_as_int - (GTK_SPIN_BUTTON(colspin))), - scm_from_int (gtk_spin_button_get_value_as_int - (GTK_SPIN_BUTTON(rowspin))), - SCM_BOOL_F); + current = scm_list_4 (SCM_CAR (current), + scm_from_int (gtk_spin_button_get_value_as_int + (GTK_SPIN_BUTTON(colspin))), + scm_from_int (gtk_spin_button_get_value_as_int + (GTK_SPIN_BUTTON(rowspin))), + SCM_BOOL_F); scm_gc_unprotect_object(r->contents_list); r->contents_list = scm_list_set_x(r->contents_list, scm_from_int (r->contents_selected), diff --git a/gnucash/import-export/qif-imp/assistant-qif-import.c b/gnucash/import-export/qif-imp/assistant-qif-import.c index b17bea8fb0..f8f2514da0 100644 --- a/gnucash/import-export/qif-imp/assistant-qif-import.c +++ b/gnucash/import-export/qif-imp/assistant-qif-import.c @@ -1422,9 +1422,9 @@ gnc_ui_qif_import_close_cb (GtkAssistant *gtkassistant, gpointer user_data) SCM gnc_ui_qif_import_assistant_get_mappings (QIFImportWindow * w) { - return SCM_LIST3(w->acct_map_info, - w->cat_map_info, - w->memo_map_info); + return scm_list_3 (w->acct_map_info, + w->cat_map_info, + w->memo_map_info); } @@ -3038,15 +3038,16 @@ gnc_ui_qif_import_convert_progress_start_cb (GtkButton * button, /* This step will fill 70% of the bar. */ gnc_progress_dialog_push (wind->convert_progress, 0.7); retval = scm_apply (qif_to_gnc, - SCM_LIST8(wind->imported_files, - wind->acct_map_info, - wind->cat_map_info, - wind->memo_map_info, - wind->security_hash, - scm_from_utf8_string (currname ? currname : ""), - wind->transaction_status, - progress), - SCM_EOL); + scm_list_n (wind->imported_files, + wind->acct_map_info, + wind->cat_map_info, + wind->memo_map_info, + wind->security_hash, + scm_from_utf8_string (currname ? currname : ""), + wind->transaction_status, + progress, + SCM_UNDEFINED), + SCM_EOL); gnc_progress_dialog_pop (wind->convert_progress); if (retval == SCM_BOOL_T) @@ -3403,9 +3404,9 @@ gnc_ui_qif_import_finish_cb (GtkAssistant *assistant, /* Save the user's mapping preferences. */ scm_result = scm_apply (save_map_prefs, - SCM_LIST5 (wind->acct_map_info, wind->cat_map_info, - wind->memo_map_info, wind->security_hash, - wind->security_prefs), + scm_list_5 (wind->acct_map_info, wind->cat_map_info, + wind->memo_map_info, wind->security_hash, + wind->security_prefs), SCM_EOL); if (scm_result == SCM_BOOL_F)