New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use kioclient for MoveItemToTrash on KDE #8528

Merged
merged 2 commits into from Apr 4, 2017

Conversation

Projects
None yet
3 participants
@Anatzum
Contributor

Anatzum commented Jan 28, 2017

馃惂 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.

Anatzum and others added some commits Jan 28, 2017

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.
Use GetDesktopEnvironment to determien desktop env
Which can get a much more precise result for us.

@zcbenz zcbenz changed the title from Update MoveItemToTrash in platform_util_linux.cc to Use kioclient for MoveItemToTrash on KDE Mar 29, 2017

@zcbenz

This comment has been minimized.

Show comment
Hide comment
@zcbenz

zcbenz Mar 29, 2017

Contributor

I have updated this PR to use base::nix::GetDesktopEnvironment instead of comparing the DESKTOP_SESSION string, it should be ready to go.

Contributor

zcbenz commented Mar 29, 2017

I have updated this PR to use base::nix::GetDesktopEnvironment instead of comparing the DESKTOP_SESSION string, it should be ready to go.

@kevinsawicki

LGTM

@zcbenz zcbenz merged commit 7265a0c into electron:master Apr 4, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment