Merge 0.92.x branch

(bzr r14950.1.12)

1 files changed, 10 insertions, 2 deletions

diff --git a/src/version.cpp b/src/version.cpp
index abe855ee7..7610cd8e7 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -21,28 +21,36 @@ bool sp_version_from_string(const char *string, Inkscape::Version *version)
     if (!string) {
         return false;
     }
-    
+
     try
     {
         std::stringstream ss;
+
+        // Throw exception if error.
+        ss.exceptions(std::ios::failbit | std::ios::badbit);
         ss << string;
         ss >> version->_major;
         char tmp=0;
         ss >> tmp;
         ss >>version->_minor;
+
+        // Don't throw exception if failbit gets set (empty string OK).
+        ss.exceptions(std::ios::goodbit);
+        getline(ss, version->_tail);
         return true;
     }
     catch(...)
     {
         version->_major = 0;
         version->_minor = 0;
+        version->_tail.clear();
         return false;
     }
 }
 
 char *sp_version_to_string(Inkscape::Version version)
 {
-    return g_strdup_printf("%u.%u", version._major, version._minor);
+    return g_strdup_printf("%u.%u%s", version._major, version._minor, version._tail.c_str());
 }
 
 bool sp_version_inside_range(Inkscape::Version version,