Merge lp:~elementary-pantheon/switchboard-plug-useraccounts/not-destructive into lp:~elementary-pantheon/switchboard-plug-useraccounts/trunk

Proposed by Danielle Foré
Status: Merged
Approved by: Cody Garver
Approved revision: 220
Merged at revision: 220
Proposed branch: lp:~elementary-pantheon/switchboard-plug-useraccounts/not-destructive
Merge into: lp:~elementary-pantheon/switchboard-plug-useraccounts/trunk
Diff against target: 12 lines (+0/-2)
1 file modified
src/Widgets/UserSettingsView.vala (+0/-2)
To merge this branch: bzr merge lp:~elementary-pantheon/switchboard-plug-useraccounts/not-destructive
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+286442@code.launchpad.net

Commit message

Don't use destructive action class for disable button

Description of the change

Don't use a destructive action class for an action that isn't destructive

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Widgets/UserSettingsView.vala'
2--- src/Widgets/UserSettingsView.vala 2015-10-18 23:04:24 +0000
3+++ src/Widgets/UserSettingsView.vala 2016-02-18 01:07:10 +0000
4@@ -312,8 +312,6 @@
5 if (get_permission ().allowed && get_current_user () != user && !is_last_admin (user)) {
6 enable_user_button.set_sensitive (true);
7 enable_lock.set_opacity (0);
8- if (!user.get_locked ())
9- enable_user_button.get_style_context ().add_class (Gtk.STYLE_CLASS_DESTRUCTIVE_ACTION);
10 }
11
12 //only update widgets if the user property has changed since last ui update

Subscribers

People subscribed via source and target branches