You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
57 lines
2.7 KiB
57 lines
2.7 KiB
--- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py |
|
+++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py |
|
@@ -182,12 +182,11 @@ |
|
|
|
class PasswordDialog(Gtk.Dialog): |
|
|
|
- def __init__ (self, user, password_mask, group_mask, parent = None): |
|
+ def __init__ (self, user, password_mask, parent = None): |
|
super(PasswordDialog, self).__init__(None, parent) |
|
|
|
self.user = user |
|
self.password_mask = password_mask |
|
- self.group_mask = group_mask |
|
|
|
self.set_modal(True) |
|
self.set_skip_taskbar_hint(True) |
|
@@ -253,14 +252,7 @@ |
|
def change_password(self): |
|
newpass = self.new_password.get_text() |
|
self.user.set_password(newpass, "") |
|
- mask = self.group_mask.get_text() |
|
- if "nopasswdlogin" in mask: |
|
- subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"]) |
|
- mask = mask.split(", ") |
|
- mask.remove("nopasswdlogin") |
|
- mask = ", ".join(mask) |
|
- self.group_mask.set_text(mask) |
|
- self.password_mask.set_text('\u2022\u2022\u2022\u2022\u2022\u2022') |
|
+ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') |
|
self.destroy() |
|
|
|
def set_passwords_visibility(self): |
|
@@ -613,7 +605,7 @@ |
|
model, treeiter = self.users_treeview.get_selection().get_selected() |
|
if treeiter is not None: |
|
user = model[treeiter][INDEX_USER_OBJECT] |
|
- dialog = PasswordDialog(user, self.password_mask, self.groups_label, self.window) |
|
+ dialog = PasswordDialog(user, self.password_mask, self.window) |
|
response = dialog.run() |
|
|
|
def _on_groups_button_clicked(self, widget): |
|
@@ -902,11 +894,11 @@ |
|
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48) |
|
description = "<b>%s</b>\n%s" % (GLib.markup_escape_text(fullname), GLib.markup_escape_text(username)) |
|
piter = self.users.append(None, [new_user, pixbuf, description]) |
|
- # Add the user to his/her own group and sudo if Administrator was selected |
|
+ # Add the user to his/her own group and wheel if Administrator was selected |
|
if dialog.account_type_combo.get_active() == 1: |
|
- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username]) |
|
+ subprocess.call(["usermod", username, "-G", "%s,wheel" % username]) |
|
else: |
|
- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username]) |
|
+ subprocess.call(["usermod", username, "-G", "%s" % username]) |
|
self.load_groups() |
|
dialog.destroy() |
|
|
|
|
|
|