mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated MoveItemToTrash in platform_util_linux.cc

Browse source 
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.
This commit is contained in:
Anatzum 2017-01-28 02:54:26 -06:00 committed by Cheng Zhao
parent 208182d8cf
commit f9dbdf4522
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
atom/common/platform_util_linux.cc
View file

@ -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) {