Clean up how the lumina-desktop closes down:

Now it is run through a "CleanSession" function beforehand to try and safely close down any applications/trays. Als reduce the number of filesystem watchers: only have one in the session itself, which sends out a signal when the desktop settings config file changes (instead of a watcher in every desktop class).

1 files changed, 4 insertions, 4 deletions

diff --git a/lumina-desktop/LDesktop.cpp b/lumina-desktop/LDesktop.cpp
index daf9b355..31baa48d 100644
--- a/lumina-desktop/LDesktop.cpp
+++ b/lumina-desktop/LDesktop.cpp
@@ -135,10 +135,10 @@ void LDesktop::InitDesktop(){
   bgtimer = new QTimer(this);
     bgtimer->setSingleShot(true);
     connect(bgtimer, SIGNAL(timeout()), this, SLOT(UpdateBackground()) );
-  watcher = new QFileSystemWatcher(this);
-    //connect(LSession::instance(), SIGNAL(DesktopConfigChanged()), this, SLOT(SettingsChanged()) );
-    watcher->addPath(settings->fileName());
-    connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(SettingsChanged()) );
+  //watcher = new QFileSystemWatcher(this);
+    connect(QApplication::instance(), SIGNAL(DesktopConfigChanged()), this, SLOT(SettingsChanged()) );
+    //watcher->addPath(settings->fileName());
+    //connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(SettingsChanged()) );
 
   if(DEBUG){ qDebug() << "Create bgWindow"; }
   bgWindow = new QWidget();