Cleanup how the ~/Desktop/* shortcuts are removed a bit. Now it catches these special files and only runs the QFile::remove() function on it (just like deleteing the file from teh CLI), and the plugin itself is removed by the update routine later on after the filesystem watcher sees the change.

1 files changed, 16 insertions, 2 deletions

diff --git a/lumina-desktop/LDesktopPluginSpace.h b/lumina-desktop/LDesktopPluginSpace.h
index 51d594f8..5ef51930 100644
--- a/lumina-desktop/LDesktopPluginSpace.h
+++ b/lumina-desktop/LDesktopPluginSpace.h
@@ -16,6 +16,8 @@
 #include <QDebug>
 #include <QFile>
 #include <QDir>
+#include <QFileInfo>
+#include <QProcess>
 
 #include "desktop-plugins/LDPlugin.h"
 
@@ -158,14 +160,26 @@ private slots:
 	  setupDrag(ID, "resize");
 	}
 	void RemoveItem(QString ID){
+	  //Special case - desktop file/dir link using the "applauncher" plugin	
+	  if(ID.startsWith("applauncher::")){
+	    QFileInfo info(ID.section("---",0,0).section("::",1,50) );
+	    if(info.exists() && info.absolutePath()==QDir::homePath()+"/Desktop"){
+	      qDebug() << "Deleting Desktop Item:" << info.absoluteFilePath();
+	      if(!info.isSymLink() && info.isDir()){ QProcess::startDetached("rm -r \""+info.absoluteFilePath()+"\""); }
+              else{ QFile::remove(info.absoluteFilePath()); } //just remove the file/symlink directly  
+	      emit PluginRemovedByUser(ID);
+	      return;
+	    }
+	  }
+	  //Any other type of plugin
 	  for(int i=0; i<ITEMS.length(); i++){
 	    if(ITEMS[i]->whatsThis()==ID){
 	      ITEMS[i]->Cleanup();
 	      delete ITEMS.takeAt(i);
-	      emit PluginRemovedByUser(ID);
-	      return;
+	      break;
 	    }
 	  }
+	  emit PluginRemovedByUser(ID);
 	}
 
 protected: