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

Take #2: Fixups for two botched gnc-plugin-page-report.c commits tonight.

Browse Source 
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
This commit is contained in:
Chris Shoemaker 2006-02-12 04:13:29 +00:00
parent 0dccf4e0cb
commit 358f677a4b
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/report/report-gnome/gnc-plugin-page-report.c
View File

@ -815,7 +815,7 @@ gnc_plugin_page_report_destroy(GncPluginPageReportPrivate * priv)
if (priv->cur_report != SCM_BOOL_F) if (priv->cur_report != SCM_BOOL_F)
scm_gc_unprotect_object(priv->cur_report); 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); scm_gc_unprotect_object(priv->edited_reports);
} }
@ -954,10 +954,11 @@ gnc_plugin_page_report_remove_edited_report(GncPluginPageReportPrivate *priv,
SCM report) SCM report)
{ {
SCM new_edited = scm_delete(priv->edited_reports, 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); scm_gc_unprotect_object(priv->edited_reports);
priv->edited_reports = new_edited; 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 void
@ -965,10 +966,11 @@ gnc_plugin_page_report_add_edited_report(GncPluginPageReportPrivate *priv,
SCM report) SCM report)
{ {
SCM new_edited = scm_cons(report, priv->edited_reports); 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); scm_gc_unprotect_object(priv->edited_reports);
priv->edited_reports = new_edited; 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 void
@ -1290,7 +1292,7 @@ gnc_plugin_page_report_export_cb( GtkAction *action, GncPluginPageReport *report
static void static void
error_handler(const char *str) error_handler(const char *str)
{ {
g_warning("Report Error: %s", str); PWARN("Report Error: %s", str);
} }
static void static void
@ -1304,7 +1306,8 @@ gnc_plugin_page_report_options_cb( GtkAction *action, GncPluginPageReport *repor
if (priv->cur_report == SCM_BOOL_F) if (priv->cur_report == SCM_BOOL_F)
return; 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) { if (result == SCM_BOOL_F || result == SCM_UNDEFINED) {
gnc_warning_dialog(GTK_WIDGET(gnc_ui_get_toplevel()), gnc_warning_dialog(GTK_WIDGET(gnc_ui_get_toplevel()),
_("There are no options for this report.")); _("There are no options for this report."));