gnucash unstable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/62c8801a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6b49b3ba (commit)
	from  https://github.com/Gnucash/gnucash/commit/59fb8efa (commit)



commit 62c8801ac5dd26400d36830067faa9aa7846edf1
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Feb 1 15:07:44 2018 -0800

    Add XDG_CONFIG_HOME and FONTCONFIG_FILE to MacOS environment
    
    Fixes WebKit crash when displaying reports.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 5ed12cc..25e67aa 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -176,7 +176,9 @@ IF (WITH_PYTHON)
 ENDIF()
 
 IF (MAC_INTEGRATION)
+  file(APPEND ${ENV_FILE_OUT} "XDG_CONFIG_HOME={HOME}/Library/Application Support/Gnucash/config\n")
   file(APPEND ${ENV_FILE_OUT} "GDK_PIXBUF_MODULE_FILE={SYS_LIB}/gdk-pixbuf-2.0/2.10.0/loaders.cache\n")
+  file(APPEND ${ENV_FILE_OUT} "FONTCONFIG_FILE={GNC_HOME}/etc/fonts/fonts.conf\n")
 ENDIF()
 
 FILE(COPY ${BUILD_ENV_FILE_OUT}

commit 6b49b3ba4c37edad651e42755ec8b5f64fc1d8bc
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Jan 30 14:33:02 2018 -0800

    Bug 792763 - deleting a transaction can cause a SIGSEGV
    
    Prevent a NULL transaction from crashing xaccTransCountSplits and
    prevent gnc_plugin_business_update_menus from calling it with a
    NULL transaction.

diff --git a/gnucash/gnome/gnc-plugin-business.c b/gnucash/gnome/gnc-plugin-business.c
index 121bd48..e1b6d57 100644
--- a/gnucash/gnome/gnc-plugin-business.c
+++ b/gnucash/gnome/gnc-plugin-business.c
@@ -923,7 +923,7 @@ gnc_plugin_business_update_menus (GncPluginPage *plugin_page)
     if (is_txn_register)
     {
         Transaction *trans = gnc_plugin_page_register_get_current_txn (GNC_PLUGIN_PAGE_REGISTER(plugin_page));
-        if (xaccTransCountSplits(trans) > 0)
+        if (trans && xaccTransCountSplits(trans) > 0)
             is_bus_txn = (xaccTransGetFirstAPARAcctSplit(trans, TRUE) != NULL);
         is_bus_doc = (xaccTransGetTxnType (trans) == TXN_TYPE_INVOICE);
     }
diff --git a/libgnucash/engine/Transaction.c b/libgnucash/engine/Transaction.c
index 755acae..1598ecb 100644
--- a/libgnucash/engine/Transaction.c
+++ b/libgnucash/engine/Transaction.c
@@ -2292,6 +2292,7 @@ int
 xaccTransCountSplits (const Transaction *trans)
 {
     gint i = 0;
+    g_return_val_if_fail (trans != NULL, 0);
     FOR_EACH_SPLIT(trans, i++);
     return i;
 }



Summary of changes:
 gnucash/CMakeLists.txt              | 2 ++
 gnucash/gnome/gnc-plugin-business.c | 2 +-
 libgnucash/engine/Transaction.c     | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)