Updated MoveItemToTrash in platform_util_linux.cc

If ELECTRON_TRASH is null, first check the DESKTOP_SESSION variable and set trash accordingly. Additional desktop environments can be added easily this way with the fallback of ELECTRON_DEFAULT_TRASH.

diff --git a/atom/common/platform_util_linux.cc b/atom/common/platform_util_linux.cc
index 923adbd..66ef0cc 100644 (file)
--- a/atom/common/platform_util_linux.cc
+++ b/atom/common/platform_util_linux.cc
@@ -98,11 +98,19 @@ void OpenExternal(const GURL& url, bool activate,
 bool MoveItemToTrash(const base::FilePath& full_path) {
   std::string trash;
   if (getenv(ELECTRON_TRASH) != NULL) {
-    trash = getenv(ELECTRON_TRASH);
+     trash = getenv(ELECTRON_TRASH);
   } else {
-    trash = ELECTRON_DEFAULT_TRASH;
+    // Determine desktop environment and set accordingly.
+    std::string desktopEnv = getenv(DESKTOP_SESSION);
+    if (desktopEnv.find("plasma") != std::string::npos) {
+      trash = "kioclient5";
+    } else if (desktopEnv.find("kde") != std::string::npos) {
+      trash = "kioclient";
+    } else {
+      trash = ELECTRON_DEFAULT_TRASH; 
+    }
   }
-
+      
   std::vector<std::string> argv;
 
   if (trash.compare("kioclient5") == 0 || trash.compare("kioclient") == 0) {