gnucash maint: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sat Jun 1 15:56:48 EDT 2019
Updated via https://github.com/Gnucash/gnucash/commit/17065160 (commit)
via https://github.com/Gnucash/gnucash/commit/3a91eedb (commit)
from https://github.com/Gnucash/gnucash/commit/885689b4 (commit)
commit 170651602c7844de256b4b05008d7edad431163a
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 1 12:55:50 2019 -0700
Restore WEBKIT1 function call, removed by mistake.
diff --git a/gnucash/report/report-gnome/gnc-plugin-page-report.c b/gnucash/report/report-gnome/gnc-plugin-page-report.c
index 5140a99bf..6c1ede21a 100644
--- a/gnucash/report/report-gnome/gnc-plugin-page-report.c
+++ b/gnucash/report/report-gnome/gnc-plugin-page-report.c
@@ -1866,9 +1866,11 @@ gnc_plugin_page_report_print_cb( GtkAction *action, GncPluginPageReport *report
//g_warning("Setting job name=%s", job_name);
-
+#ifdef WEBKIT1
+ gnc_html_print (priv->html, job_name, FALSE);
+#else
gnc_html_print (priv->html, job_name);
-
+#endif
g_free (job_name);
}
commit 3a91eedb455760da008386a44c02f8b9796e9a9b
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 1 12:55:17 2019 -0700
Fix new gcc-8 warning about strncat.
gcc-8 wants us to use strcat for string constants.
diff --git a/borrowed/libc/strptime.c b/borrowed/libc/strptime.c
index 0d212a901..7db05e6d9 100644
--- a/borrowed/libc/strptime.c
+++ b/borrowed/libc/strptime.c
@@ -643,7 +643,7 @@ start_over:
char *posix_d_t_fmt;
strncpy (d_t_fmt, date_locale_string, date_len);
- strncat (d_t_fmt, " ", 1);
+ strcat (d_t_fmt, " ");
strncat (d_t_fmt, time_locale_string, time_len);
free (date_locale_string);
free (time_locale_string);
@@ -888,7 +888,7 @@ match_century:
char *posix_t_p_fmt;
strncpy (t_p_fmt, locale_string, locale_len);
- strncat (t_p_fmt, " tt", 3);
+ strcat (t_p_fmt, " tt");
posix_t_p_fmt = translate_win32_picture (t_p_fmt);
Summary of changes:
borrowed/libc/strptime.c | 4 ++--
gnucash/report/report-gnome/gnc-plugin-page-report.c | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
More information about the gnucash-changes
mailing list