Bug 306489

Summary:	Shutdown dialogue always shows "Restart computer" option, even when logout/shutdown was selected
Product:	[Unmaintained] ksmserver	Reporter:	Ralf Jung <post>
Component:	ui	Assignee:	Lubos Lunak <l.lunak>
Status:	RESOLVED FIXED
Severity:	normal
Priority:	NOR
Version:	4.9.1
Target Milestone:	---
Platform:	Compiled Sources
OS:	Linux
Latest Commit:	http://commits.kde.org/kde-workspace/fab7292269777ed2e46cf444a47a9e8da950fcbe	Version Fixed In:	4.9.2
Sentry Crash Report:

Description Ralf Jung 2012-09-09 11:41:32 UTC

When logging out or shutting down the PC, the confirmation dialogue shown by ksmserver also (incorrectly) offers the option to reboot the system.

Reproducible: Always

Steps to Reproduce:
1. In the K-Menu, select "Log out" or "Shut down"
Actual Results:  
A confirmation window appears, showing the option to Log out/Shut down, but also the option to restart the system. Above these two buttons, there is a lot of free space.

Expected Results:  
The confirmation window should only offer the selected action, and the dialogue should not have that much unused space.

The expected result describe the behaviour of KDE 4.8.5. This bug is a regression in 4.9.1 (did not test 4.9.0).

Comment 1 Lamarque V. Souza 2012-09-09 18:30:42 UTC

Git commit 4bf7cb3071f05e48a1e9b4f0eacbcaa311fcc2fe by Lamarque V. Souza.
Committed on 09/09/2012 at 20:24.
Pushed by lvsouza into branch 'KDE/4.9'.

Do not unnecessarily show "Restart Computer" button and remove excess of
free space in shutdown dialog.
FIXED-IN: 4.9.2
(cherry picked from commit fab7292269777ed2e46cf444a47a9e8da950fcbe)

M  +3    -2    ksmserver/themes/default/main.qml

http://commits.kde.org/kde-workspace/4bf7cb3071f05e48a1e9b4f0eacbcaa311fcc2fe

Comment 2 Lamarque V. Souza 2012-09-09 18:30:43 UTC

Git commit fab7292269777ed2e46cf444a47a9e8da950fcbe by Lamarque V. Souza.
Committed on 09/09/2012 at 20:24.
Pushed by lvsouza into branch 'master'.

Do not unnecessarily show "Restart Computer" button and remove excess of
free space in shutdown dialog.
FIXED-IN: 4.9.2

M  +3    -2    ksmserver/themes/default/main.qml

http://commits.kde.org/kde-workspace/fab7292269777ed2e46cf444a47a9e8da950fcbe

Comment 3 Ralf Jung 2012-09-09 18:45:48 UTC

Wow, that was fast - thanks a lot :)