aboutsummaryrefslogtreecommitdiff
path: root/src-qt5
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-09-21 16:15:49 -0400
committerKen Moore <ken@ixsystems.com>2017-09-21 16:15:49 -0400
commita27815312eaac620881d67e8776c743595975b38 (patch)
treead93815d06cf2fc658fd6890785d32bccecf0690 /src-qt5
parentUrg - more fixes... (diff)
downloadlumina-a27815312eaac620881d67e8776c743595975b38.tar.gz
lumina-a27815312eaac620881d67e8776c743595975b38.tar.bz2
lumina-a27815312eaac620881d67e8776c743595975b38.zip
Final fix - re-enable some backwards-compatible code and put a big warning at the top of the function
Diffstat (limited to 'src-qt5')
-rw-r--r--src-qt5/core/libLumina/LDesktopUtils.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src-qt5/core/libLumina/LDesktopUtils.cpp b/src-qt5/core/libLumina/LDesktopUtils.cpp
index 262bf47b..fb13a2a3 100644
--- a/src-qt5/core/libLumina/LDesktopUtils.cpp
+++ b/src-qt5/core/libLumina/LDesktopUtils.cpp
@@ -457,6 +457,8 @@ void LDesktopUtils::LoadSystemDefaults(bool skipOS){
}
bool LDesktopUtils::checkUserFiles(QString lastversion, QString currentversion){
+ //WARNING: Make sure you create a QApplication instance before calling this function!!!
+
//internal version conversion examples:
// [1.0.0 -> 1000000], [1.2.3 -> 1002003], [0.6.1 -> 6001]
//returns true if something changed
@@ -479,7 +481,7 @@ bool LDesktopUtils::checkUserFiles(QString lastversion, QString currentversion){
LDesktopUtils::upgradeFavorites(oldversion);
}
//Convert from the old desktop numbering system to the new one (change occured with 1.0.1)
- /*if(oldversion<=1000001){
+ if(oldversion<=1000001){
QStringList DS = LUtils::readFile(dset);
char *tmp;
int tmpN = 0;
@@ -505,7 +507,7 @@ bool LDesktopUtils::checkUserFiles(QString lastversion, QString currentversion){
}
}
LUtils::writeFile(dset, DS, true);
- }*/
+ }
//Check the fluxbox configuration files
dset = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/";
bgstack15