gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/72f630e8 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d3933f7c (commit)
	from  https://github.com/Gnucash/gnucash/commit/8291c299 (commit)



commit 72f630e8e32e427bdc84540c71e85feb19d72c89
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Jun 23 09:41:51 2016 -0700

    Bug 760021 - File "Save As" to an existing file...overwrites without warning.
    
    Save_may_clobber_data was looking at the wrong fullpath.

diff --git a/src/backend/xml/gnc-backend-xml.c b/src/backend/xml/gnc-backend-xml.c
index 8c2f32a..e73b323 100644
--- a/src/backend/xml/gnc-backend-xml.c
+++ b/src/backend/xml/gnc-backend-xml.c
@@ -95,7 +95,7 @@ typedef int ssize_t;
 
 static QofLogModule log_module = GNC_MOD_BACKEND;
 
-static gboolean save_may_clobber_data (QofBackend *bend);
+static gboolean save_may_clobber_data (FileBackend *bend);
 
 /* ================================================================= */
 
@@ -263,7 +263,7 @@ xml_session_begin(QofBackend *be_start, QofSession *session,
         LEAVE("");
         return;
     }
-    if (create && !force && save_may_clobber_data( be_start ) )
+    if (create && !force && save_may_clobber_data (be))
     {
         qof_backend_set_error (be_start, ERR_BACKEND_STORE_EXISTS);
         LEAVE("Might clobber, no force");
@@ -1165,7 +1165,7 @@ gnc_xml_be_load_from_file (QofBackend *bend, QofBook *book, QofBackendLoadType l
 /* ---------------------------------------------------------------------- */
 
 static gboolean
-save_may_clobber_data (QofBackend *bend)
+save_may_clobber_data (FileBackend *bend)
 {
     struct stat statbuf;
     if (!bend->fullpath) return FALSE;

commit d3933f7c835ba1f80de002bb887b110948705876
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Jun 23 09:41:48 2016 -0700

    Bump CMake version to current.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae4e82b..889df11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ ENABLE_TESTING()
 # Version number of gnucash
 SET (GNUCASH_MAJOR_VERSION 2)
 SET (GNUCASH_MINOR_VERSION 6)
-SET (GNUCASH_MICRO_VERSION 11)
+SET (GNUCASH_MICRO_VERSION 12)
 SET (GNUCASH_NANO_VERSION 0)
 SET (VERSION "${GNUCASH_MAJOR_VERSION}.${GNUCASH_MINOR_VERSION}.${GNUCASH_MICRO_VERSION}")
 SET (GNUCASH_LATEST_STABLE_SERIES 2.6)



Summary of changes:
 CMakeLists.txt                    | 2 +-
 src/backend/xml/gnc-backend-xml.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)