Merge lp:~phablet-team/history-service/fix-snap-database-path into lp:~renatofilho/history-service/snap-path

[Roberto Mier Escandon]

~/Development/cpp/unity8-session-snap/trunk

Fix database path, not valid into snap packages

[lp:~phablet-team/history-service/fix-snap-database-path]

235. By Roberto Mier Escandon on 2016-11-24

removed not needed include

Unmerged revisions

235. By Roberto Mier Escandon on 2016-11-24

removed not needed include

234. By Roberto Mier Escandon on 2016-11-24

updated plugin db path

=== modified file 'plugins/sqlite/sqlitedatabase.cpp'
--- plugins/sqlite/sqlitedatabase.cpp	2015-10-06 12:54:04 +0000
+++ plugins/sqlite/sqlitedatabase.cpp	2016-11-24 21:18:17 +0000
@@ -76,7 +76,12 @@
     mDatabasePath = qgetenv("HISTORY_SQLITE_DBPATH");
 
     if (mDatabasePath.isEmpty()) {
-        mDatabasePath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
+        // If snapped use snap folder for user common data across different versions
+        if (qEnvironmentVariableIsSet("SNAP_USER_COMMON")) {
+            mDatabasePath = QString(qgetenv("SNAP_USER_COMMON"));
+        } else {
+            mDatabasePath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
+        }
 
         QDir dir(mDatabasePath);
         if (!dir.exists("history-service") && !dir.mkpath("history-service")) {