diff options
| author | Ken Moore <ken@ixsystems.com> | 2017-09-21 16:13:28 -0400 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2017-09-21 16:13:28 -0400 |
| commit | bf91a7abadbb6b285dc955393633325928903bf6 (patch) | |
| tree | ac6a728d10881ee6420ae419266e8506b4848623 /src-qt5 | |
| parent | Quick fix to ensure the status checkUserFiles function truly is static (diff) | |
| download | lumina-bf91a7abadbb6b285dc955393633325928903bf6.tar.gz lumina-bf91a7abadbb6b285dc955393633325928903bf6.tar.bz2 lumina-bf91a7abadbb6b285dc955393633325928903bf6.zip | |
Urg - more fixes...
Diffstat (limited to 'src-qt5')
| -rw-r--r-- | src-qt5/core/libLumina/LDesktopUtils.cpp | 6 | ||||
| -rw-r--r-- | src-qt5/core/lumina-desktop/LSession.cpp | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src-qt5/core/libLumina/LDesktopUtils.cpp b/src-qt5/core/libLumina/LDesktopUtils.cpp index a5c1bd77..262bf47b 100644 --- a/src-qt5/core/libLumina/LDesktopUtils.cpp +++ b/src-qt5/core/libLumina/LDesktopUtils.cpp @@ -155,8 +155,8 @@ void LDesktopUtils::LoadSystemDefaults(bool skipOS){ if(sysDefaults.isEmpty()){ sysDefaults = LUtils::readFile(LOS::LuminaShare()+"luminaDesktop.conf"); } //Find the number of the left-most desktop screen QString screen = "0"; - QDesktopWidget *desk =QApplication::desktop(); QRect screenGeom; + QDesktopWidget *desk =QApplication::desktop(); for(int i=0; i<desk->screenCount(); i++){ if(desk->screenGeometry(i).x()==0){ screen = QString::number(i); @@ -479,7 +479,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 +505,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/"; diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index 99b20194..d1d6588e 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -389,6 +389,9 @@ void LSession::checkUserFiles(){ // [1.0.0 -> 1000000], [1.2.3 -> 1002003], [0.6.1 -> 6001] QSettings sset("lumina-desktop", "sessionsettings"); QString OVS = sset.value("DesktopVersion","0").toString(); //Old Version String + char *tmp; + int tmpN = 0; + QApplication A(tmpN, &tmp); bool changed = LDesktopUtils::checkUserFiles(OVS, LDesktopUtils::LuminaDesktopVersion()); if(changed){ //Save the current version of the session to the settings file (for next time) |