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

Merge origin/master into enable-webview

Browse source
This commit is contained in:
Kevin Sawicki 2017-05-19 10:17:34 -07:00
commit 74b7afbec7
155 changed files with 796 additions and 644 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/common/platform_util_linux.cc
View file

@ -126,6 +126,10 @@ bool MoveItemToTrash(const base::FilePath& full_path) {
} else if (trash.compare("trash-cli") == 0) {
argv.push_back("trash-put");
argv.push_back(full_path.value());
} else if (trash.compare("gio") == 0) {
argv.push_back("gio");
argv.push_back("trash");
argv.push_back(full_path.value());
} else {
argv.push_back(ELECTRON_DEFAULT_TRASH);
argv.push_back(full_path.value());