gnucash master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/7e7d4284 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/639d52f9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6a359f86 (commit)
	from  https://github.com/Gnucash/gnucash/commit/4d5a37d2 (commit)



commit 7e7d42847c4540b44da983a2c5a4f4856d22cb4a
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Aug 19 14:27:33 2017 +0200

    Fix load string KVP memory error.

diff --git a/libgnucash/backend/sql/gnc-slots-sql.cpp b/libgnucash/backend/sql/gnc-slots-sql.cpp
index bd9c341..be97ba1 100644
--- a/libgnucash/backend/sql/gnc-slots-sql.cpp
+++ b/libgnucash/backend/sql/gnc-slots-sql.cpp
@@ -361,9 +361,8 @@ set_string_val (gpointer pObject,  gpointer pValue)
 
     if (pInfo->value_type != KvpValue::Type::STRING || pValue == NULL)
         return;
-    auto value = new KvpValue {static_cast<const char*> (pValue)};
+    auto value = new KvpValue {g_strdup(static_cast<const char*> (pValue))};
     set_slot_from_value (pInfo, value);
-    delete value;
 }
 
 static  gpointer

commit 639d52f916ce9cc1b74194cf0c37338259be799c
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Aug 19 14:27:28 2017 +0200

    Fix typo, broke build on Mac.

diff --git a/common/test-core/Makefile.am b/common/test-core/Makefile.am
index 8b57f25..f77b2d5 100644
--- a/common/test-core/Makefile.am
+++ b/common/test-core/Makefile.am
@@ -21,7 +21,7 @@ libtest_core_la_CPPFLAGS = \
   ${GLIB_CFLAGS}
 
 libtest_core_la_LDFLAGS = \
-  -rpath ${exec-prefix}/lib
+  -rpath ${exec_prefix}/lib
 
 if BUILDING_FROM_VCS
 swig-unittest-support-guile.c: unittest-support.i $(top_srcdir)/common/base-typemaps.i

commit 6a359f86a07b2adcf6233cafc7531656e02cc6df
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Aug 16 23:16:42 2017 +0200

    Fix mac looking in wrong directory for libgncmod-backend-dbi.dylib.

diff --git a/libgnucash/backend/dbi/test/test-backend-dbi.cpp b/libgnucash/backend/dbi/test/test-backend-dbi.cpp
index 4936ed0..ff51ab0 100644
--- a/libgnucash/backend/dbi/test/test-backend-dbi.cpp
+++ b/libgnucash/backend/dbi/test/test-backend-dbi.cpp
@@ -30,9 +30,9 @@ extern "C"
 extern void test_suite_gnc_backend_dbi ();
 
 #define GNC_LIB_NAME_1 "gncmod-backend-dbi"
-#define GNC_LIB_REL_PATH_1 "dbi"
+#define GNC_LIB_REL_PATH_1 "gnucash"
 #define GNC_LIB_NAME_2 "gncmod-backend-xml"
-#define GNC_LIB_REL_PATH_2 "xml"
+#define GNC_LIB_REL_PATH_2 "gnucash"
 
 int
 main (int   argc,
diff --git a/libgnucash/engine/gnc-engine.c b/libgnucash/engine/gnc-engine.c
index a61dfd8..34d1348 100644
--- a/libgnucash/engine/gnc-engine.c
+++ b/libgnucash/engine/gnc-engine.c
@@ -74,10 +74,10 @@ gnc_engine_init_part2()
     } libs[] =
     {
 #if defined( HAVE_DBI_DBI_H )
-        { "dbi", "gncmod-backend-dbi", TRUE },
+        { "gnucash", "gncmod-backend-dbi", TRUE },
 #endif
-        { "xml", "gncmod-backend-xml", TRUE },
-        { NULL, NULL, FALSE }
+        { "gnucash", "gncmod-backend-xml", TRUE },
+        { NULL, FALSE }
     }, *lib;
 
     for (lib = libs; lib->lib ; lib++)



Summary of changes:
 common/test-core/Makefile.am                     | 2 +-
 libgnucash/backend/dbi/test/test-backend-dbi.cpp | 4 ++--
 libgnucash/backend/sql/gnc-slots-sql.cpp         | 3 +--
 libgnucash/engine/gnc-engine.c                   | 6 +++---
 4 files changed, 7 insertions(+), 8 deletions(-)