gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/d2fa23dd (commit)
	 via  https://github.com/Gnucash/gnucash/commit/b741c8e1 (commit)
	from  https://github.com/Gnucash/gnucash/commit/7d940a5d (commit)



commit d2fa23dd5f8164a14ee1af72d06a177208652d42
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Jul 10 12:45:12 2015 -0700

    Bug 752204 - .gml2 files are modified during build
    
    Turn off compression so that they aren't, except when scrub changes them
    to a new format. In those cases the changes should be committed.

diff --git a/src/backend/xml/test/test-load-xml2.c b/src/backend/xml/test/test-load-xml2.c
index 814d7a5..da77e17 100644
--- a/src/backend/xml/test/test-load-xml2.c
+++ b/src/backend/xml/test/test-load-xml2.c
@@ -42,6 +42,7 @@
 #include <gnc-engine.h>
 #include "../gnc-backend-xml.h"
 #include "../io-gncxml-v2.h"
+#include <gnc-prefs.h>
 
 #include <test-stuff.h>
 #include <unittest-support.h>
@@ -91,6 +92,7 @@ test_load_file(const char *filename)
     remove_locks(filename);
 
     ignore_lock = (g_strcmp0(g_getenv("SRCDIR"), ".") != 0);
+    gnc_prefs_set_file_save_compressed(FALSE);
     qof_session_begin(session, filename, ignore_lock, FALSE, TRUE);
 
     qof_session_load(session, NULL);
@@ -105,6 +107,7 @@ test_load_file(const char *filename)
                  "qof error=%d for file [%s]",
                  qof_session_get_error(session), filename);
     /* Uncomment the line below to generate corrected files */
+    gnc_prefs_set_file_save_compressed(FALSE);
     qof_session_save( session, NULL );
     qof_session_end(session);
 }

commit b741c8e1de4384ea302fc073d287af7ef4ca96d0
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Jul 10 12:43:25 2015 -0700

    Initialize GError to NULL or it doesn't work.

diff --git a/src/core-utils/gnc-environment.c b/src/core-utils/gnc-environment.c
index 51e74f4..06b2055 100644
--- a/src/core-utils/gnc-environment.c
+++ b/src/core-utils/gnc-environment.c
@@ -102,7 +102,7 @@ gnc_environment_setup (void)
     gchar *config_path;
     gchar *env_file;
     GKeyFile    *keyfile = g_key_file_new();
-    GError      *error;
+    GError      *error = NULL;
     gchar **env_vars;
     gsize param_count;
     gint i;



Summary of changes:
 src/backend/xml/test/test-load-xml2.c | 3 +++
 src/core-utils/gnc-environment.c      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)