|
 |
113da80 |
--- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
|
|
|
113da80 |
+++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
|
|
|
eae76e3 |
@@ -145,12 +145,11 @@ class EditableEntry (Gtk.Notebook):
|
|
|
da1fe70 |
|
|
|
da1fe70 |
class PasswordDialog(Gtk.Dialog):
|
|
|
da1fe70 |
|
|
|
da1fe70 |
- def __init__ (self, user, password_mask, group_mask):
|
|
|
eae76e3 |
+ def __init__ (self, user, password_mask):
|
|
|
da1fe70 |
super(PasswordDialog, self).__init__()
|
|
|
da1fe70 |
|
|
|
da1fe70 |
self.user = user
|
|
|
da1fe70 |
self.password_mask = password_mask
|
|
|
da1fe70 |
- self.group_mask = group_mask
|
|
|
da1fe70 |
|
|
|
da1fe70 |
self.set_modal(True)
|
|
|
da1fe70 |
self.set_skip_taskbar_hint(True)
|
|
|
eae76e3 |
@@ -216,14 +215,7 @@ class PasswordDialog(Gtk.Dialog):
|
|
|
da1fe70 |
def change_password(self):
|
|
|
da1fe70 |
newpass = self.new_password.get_text()
|
|
|
da1fe70 |
self.user.set_password(newpass, "")
|
|
|
da1fe70 |
- mask = self.group_mask.get_text()
|
|
|
eae76e3 |
- if "nopasswdlogin" in mask:
|
|
|
eae76e3 |
- os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
|
|
|
eae76e3 |
- mask = mask.split(", ")
|
|
|
eae76e3 |
- mask.remove("nopasswdlogin")
|
|
|
eae76e3 |
- mask = ", ".join(mask)
|
|
|
eae76e3 |
- self.group_mask.set_text(mask)
|
|
|
eae76e3 |
- self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
|
|
|
eae76e3 |
+ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
|
|
|
da1fe70 |
self.destroy()
|
|
|
da1fe70 |
|
|
|
eae76e3 |
def set_passwords_visibility(self):
|
|
|
eae76e3 |
@@ -517,7 +509,7 @@ class Module:
|
|
|
da1fe70 |
model, treeiter = self.users_treeview.get_selection().get_selected()
|
|
|
da1fe70 |
if treeiter != None:
|
|
|
da1fe70 |
user = model[treeiter][INDEX_USER_OBJECT]
|
|
|
da1fe70 |
- dialog = PasswordDialog(user, self.password_mask, self.groups_label)
|
|
|
da1fe70 |
+ dialog = PasswordDialog(user, self.password_mask)
|
|
|
da1fe70 |
response = dialog.run()
|
|
|
da1fe70 |
|
|
|
da1fe70 |
def _on_groups_button_clicked(self, widget):
|
|
|
eae76e3 |
@@ -756,11 +748,11 @@ class Module:
|
|
|
113da80 |
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
|
|
|
113da80 |
description = "%s\n%s" % (fullname, username)
|
|
|
113da80 |
piter = self.users.append(None, [new_user, pixbuf, description])
|
|
|
113da80 |
- # Add the user to his/her own group and sudo if Administrator was selected
|
|
|
113da80 |
+ # Add the user to his/her own group and wheel if Administrator was selected
|
|
|
113da80 |
if dialog.account_type_combo.get_active() == 1:
|
|
|
a42c6f4 |
- os.system("usermod %s -G %s,sudo,nopasswdlogin" % (username, username))
|
|
|
da1fe70 |
+ os.system("usermod %s -G %s,wheel" % (username, username))
|
|
|
113da80 |
else:
|
|
|
da1fe70 |
- os.system("usermod %s -G %s,nopasswdlogin" % (username, username))
|
|
|
da1fe70 |
+ os.system("usermod %s -G %s" % (username, username))
|
|
|
da1fe70 |
self.load_groups()
|
|
|
da1fe70 |
dialog.destroy()
|
|
|
eae76e3 |
|