From 358f677a4beab9a873d9153fd8b5cf8102c5ed4b Mon Sep 17 00:00:00 2001 From: Chris Shoemaker Date: Sun, 12 Feb 2006 04:13:29 +0000 Subject: [PATCH] Take #2: Fixups for two botched gnc-plugin-page-report.c commits tonight. 1) Correctly handle gc protection for non-boolean 'edited_reports' field. 2) Pass list argument instead of immediate to gfec_apply. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13228 57a11ea4-9604-0410-9ed3-97b8803252fd --- .../report-gnome/gnc-plugin-page-report.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/report/report-gnome/gnc-plugin-page-report.c b/src/report/report-gnome/gnc-plugin-page-report.c index e3c8c6d523..d30089207c 100644 --- a/src/report/report-gnome/gnc-plugin-page-report.c +++ b/src/report/report-gnome/gnc-plugin-page-report.c @@ -815,7 +815,7 @@ gnc_plugin_page_report_destroy(GncPluginPageReportPrivate * priv) if (priv->cur_report != SCM_BOOL_F) scm_gc_unprotect_object(priv->cur_report); - if (priv->edited_reports != SCM_BOOL_F) + if (priv->edited_reports != SCM_EOL) scm_gc_unprotect_object(priv->edited_reports); } @@ -954,10 +954,11 @@ gnc_plugin_page_report_remove_edited_report(GncPluginPageReportPrivate *priv, SCM report) { SCM new_edited = scm_delete(priv->edited_reports, report); - if (priv->edited_reports != SCM_BOOL_F) + if (priv->edited_reports != SCM_EOL) scm_gc_unprotect_object(priv->edited_reports); priv->edited_reports = new_edited; - scm_gc_protect_object(priv->edited_reports); + if (new_edited != SCM_EOL) + scm_gc_protect_object(priv->edited_reports); } void @@ -965,10 +966,11 @@ gnc_plugin_page_report_add_edited_report(GncPluginPageReportPrivate *priv, SCM report) { SCM new_edited = scm_cons(report, priv->edited_reports); - if (priv->edited_reports != SCM_BOOL_F) + if (priv->edited_reports != SCM_EOL) scm_gc_unprotect_object(priv->edited_reports); priv->edited_reports = new_edited; - scm_gc_protect_object(priv->edited_reports); + if (new_edited != SCM_EOL) + scm_gc_protect_object(priv->edited_reports); } void @@ -1290,7 +1292,7 @@ gnc_plugin_page_report_export_cb( GtkAction *action, GncPluginPageReport *report static void error_handler(const char *str) { - g_warning("Report Error: %s", str); + PWARN("Report Error: %s", str); } static void @@ -1304,7 +1306,8 @@ gnc_plugin_page_report_options_cb( GtkAction *action, GncPluginPageReport *repor if (priv->cur_report == SCM_BOOL_F) return; - result = gfec_apply(start_editor, priv->cur_report, error_handler); + result = gfec_apply(start_editor, scm_cons(priv->cur_report, SCM_EOL), + error_handler); if (result == SCM_BOOL_F || result == SCM_UNDEFINED) { gnc_warning_dialog(GTK_WIDGET(gnc_ui_get_toplevel()), _("There are no options for this report."));