Skip to content
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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Remove workaround for shutdown on KDE plasma5 #5559

Merged
merged 1 commit into from
Aug 9, 2018
Merged

Remove workaround for shutdown on KDE plasma5 #5559

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 1 addition & 20 deletions lib/utils.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,26 +629,7 @@ sub poweroff_x11 {
if (check_var("DESKTOP", "kde")) {
send_key "ctrl-alt-delete"; # shutdown
assert_screen_with_soft_timeout('logoutdialog', timeout => 90, soft_timeout => 15, 'bsc#1091933');

if (get_var("PLASMA5")) {
assert_and_click 'sddm_shutdown_option_btn';
if (check_screen([qw(sddm_shutdown_option_btn sddm_shutdown_btn)], 3)) {
# sometimes not reliable, since if clicked the background
# color of button should changed, thus check and click again
if (match_has_tag('sddm_shutdown_option_btn')) {
assert_and_click 'sddm_shutdown_option_btn';
}
# plasma < 5.8
elsif (match_has_tag('sddm_shutdown_btn')) {
assert_and_click 'sddm_shutdown_btn';
}
}
}
else {
type_string "\t";
assert_screen "kde-turn-off-selected", 2;
type_string "\n";
}
assert_and_click 'sddm_shutdown_option_btn';
}

if (check_var("DESKTOP", "gnome")) {
Expand Down