gnucash master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/7fd38c88 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a96a68fd (commit)
	from  https://github.com/Gnucash/gnucash/commit/0946b031 (commit)



commit 7fd38c88a57d707ecb29f01718bfec3979cce4ea
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Aug 17 12:36:48 2017 +0200

    Improve a comment
    
    My Ingrish is pretty poor at times...

diff --git a/libgnucash/engine/qof-backend.cpp b/libgnucash/engine/qof-backend.cpp
index 4c4aef9..79943b1 100644
--- a/libgnucash/engine/qof-backend.cpp
+++ b/libgnucash/engine/qof-backend.cpp
@@ -82,16 +82,17 @@ QofBackend::get_message ()
     return std::move(m_error_msg);
 }
 
-/* Helper function that return a directory from which the requested module
+/* Helper function that returns a directory from which the requested module
  * can be loaded. This is needed because the location of the modules
  * depends on
  * - whether we're running in an installed environment or the build environment
- * - the operation system
+ * - the operating system
  * - (in the build environment) which build system is used
  *
  * Note parameter rel_path is only used when invoked in the build environment
- * because each backend module is likely to reside in its own directory. At
- * install time it is assumed all backend modules reside in one single directory.
+ * and even then only for autotools builds because each backend module is likely
+ * to reside in its own directory in that configuration. At install time or in a
+ * cmake build it is assumed all backend modules reside in one single directory.
  */
 static char* get_default_module_dir(const char* rel_path)
 {

commit a96a68fd4e65a6951d34fbc261c0a46e3ed11563
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Aug 17 12:33:08 2017 +0200

    Add as many values as there are fields in the list
    
    This wasn't causing trouble, but it looks more correct this way.

diff --git a/libgnucash/engine/gnc-engine.c b/libgnucash/engine/gnc-engine.c
index 0cb344d..a61dfd8 100644
--- a/libgnucash/engine/gnc-engine.c
+++ b/libgnucash/engine/gnc-engine.c
@@ -77,7 +77,7 @@ gnc_engine_init_part2()
         { "dbi", "gncmod-backend-dbi", TRUE },
 #endif
         { "xml", "gncmod-backend-xml", TRUE },
-        { NULL, FALSE }
+        { NULL, NULL, FALSE }
     }, *lib;
 
     for (lib = libs; lib->lib ; lib++)



Summary of changes:
 libgnucash/engine/gnc-engine.c    | 2 +-
 libgnucash/engine/qof-backend.cpp | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)