gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/238c889d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/289bfc2a (commit)
	from  https://github.com/Gnucash/gnucash/commit/cbe6c230 (commit)



commit 238c889da3fadfd1c92502a0eaf4144a899e9e36
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Oct 13 13:05:18 2014 -0700

    Bug 738113 - Crash on reload budget report.

diff --git a/src/engine/gnc-budget.c b/src/engine/gnc-budget.c
index ae1e2e3..4a0dc1c 100644
--- a/src/engine/gnc-budget.c
+++ b/src/engine/gnc-budget.c
@@ -578,7 +578,8 @@ gnc_budget_get_account_period_value(const GncBudget *budget, const Account *acco
 Timespec
 gnc_budget_get_period_start_date(const GncBudget *budget, guint period_num)
 {
-    Timespec ts;
+    Timespec ts = {0, 0};
+    g_return_val_if_fail (GNC_IS_BUDGET(budget), ts);
     timespecFromTime64(
         &ts, recurrenceGetPeriodTime(&GET_PRIVATE(budget)->recurrence,
                                      period_num, FALSE));
@@ -588,7 +589,8 @@ gnc_budget_get_period_start_date(const GncBudget *budget, guint period_num)
 Timespec
 gnc_budget_get_period_end_date(const GncBudget *budget, guint period_num)
 {
-    Timespec ts;
+    Timespec ts = {0, 0};
+    g_return_val_if_fail (GNC_IS_BUDGET(budget), ts);
     timespecFromTime64(
         &ts,  recurrenceGetPeriodTime(&GET_PRIVATE(budget)->recurrence, period_num, TRUE));
     return ts;

commit 289bfc2aefdf203881bc3e130cc98aa720e558df
Author: Jeff Earickson <jaearick at colby.edu>
Date:   Sun Oct 12 22:29:40 2014 -0400

    Remove bare percent sign in taxinvoice.scm, replace with English.
    
    The bare percent sign in this string messes with po translation
    files and causes difficulties compiling without backslashes and
    other pain.  Cleans up the English by using real words.

diff --git a/src/report/business-reports/taxinvoice.scm b/src/report/business-reports/taxinvoice.scm
index 106f8d7..ce7c0ed 100644
--- a/src/report/business-reports/taxinvoice.scm
+++ b/src/report/business-reports/taxinvoice.scm
@@ -193,7 +193,7 @@
                 (N_ "Name of a file containing a logo to be used on the report.") 
                 ""))
   (add-option (gnc:make-string-option
-                displaypage optname-logo-width "f" (N_ "Width of the logo in CSS format, e.g. 10% or 32px. Leave blank to display the logo at its natural width. The height of the logo will be scaled accordingly.") ""))
+                displaypage optname-logo-width "f" (N_ "Width of the logo in CSS format, e.g. 10 percent or 32 pixels. Leave blank to display the logo at its natural width. The height of the logo will be scaled accordingly.") ""))
 (add-option (gnc:make-simple-boolean-option	displaypage	optname-border-collapse	"g" (N_ "Border-collapse?") #f))
 (add-option (gnc:make-string-option		displaypage	optname-border-color-th "h" (N_ "CSS color.") "black"))
 (add-option (gnc:make-string-option		displaypage	optname-border-color-td "i" (N_ "CSS color.") "black"))



Summary of changes:
 src/engine/gnc-budget.c                    | 6 ++++--
 src/report/business-reports/taxinvoice.scm | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)