diff options
| author | william <william.os4y@gmail.com> | 2015-03-26 19:18:45 +0100 |
|---|---|---|
| committer | william <william.os4y@gmail.com> | 2015-03-26 19:18:45 +0100 |
| commit | 851c91e92ef57de3cdec582048a134ff5b5552f8 (patch) | |
| tree | 8d7119048c2ca9b3f60c9a8a2f5699f6a18eb1b2 /lumina-desktop/LSession.cpp | |
| parent | Warn the user is they want to change a elemnt having translated values. (diff) | |
| parent | Actually move the file/dir copy onto itself check earlier in the procedure, t... (diff) | |
| download | lumina-851c91e92ef57de3cdec582048a134ff5b5552f8.tar.gz lumina-851c91e92ef57de3cdec582048a134ff5b5552f8.tar.bz2 lumina-851c91e92ef57de3cdec582048a134ff5b5552f8.zip | |
Merge remote-tracking branch 'upstream/master' into deskEditor
Diffstat (limited to 'lumina-desktop/LSession.cpp')
| -rw-r--r-- | lumina-desktop/LSession.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp index 8eef0b95..6437524b 100644 --- a/lumina-desktop/LSession.cpp +++ b/lumina-desktop/LSession.cpp @@ -257,6 +257,11 @@ void LSession::checkUserFiles(){ }*/ LUtils::LoadSystemDefaults(); } + if(oldversion <= 83){ + //Convert the old->new favorites framework + + } + //Check for the default applications file for lumina-open dset = QDir::homePath()+"/.lumina/LuminaDE/lumina-open.conf"; if(!QFile::exists(dset)){ |