|
Line
Link Here
|
| 0 |
-- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py |
0 |
++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py |
|
Lines 145-156
Link Here
|
| 145 |
|
145 |
|
| 146 |
class PasswordDialog(Gtk.Dialog): |
146 |
class PasswordDialog(Gtk.Dialog): |
| 147 |
|
147 |
|
| 148 |
def __init__ (self, user, password_mask, group_mask): |
148 |
def __init__ (self, user, password_mask): |
| 149 |
super(PasswordDialog, self).__init__() |
149 |
super(PasswordDialog, self).__init__() |
| 150 |
|
150 |
|
| 151 |
self.user = user |
151 |
self.user = user |
| 152 |
self.password_mask = password_mask |
152 |
self.password_mask = password_mask |
| 153 |
self.group_mask = group_mask |
|
|
| 154 |
|
153 |
|
| 155 |
self.set_modal(True) |
154 |
self.set_modal(True) |
| 156 |
self.set_skip_taskbar_hint(True) |
155 |
self.set_skip_taskbar_hint(True) |
|
Lines 216-227
Link Here
|
| 216 |
def change_password(self): |
215 |
def change_password(self): |
| 217 |
newpass = self.new_password.get_text() |
216 |
newpass = self.new_password.get_text() |
| 218 |
self.user.set_password(newpass, "") |
217 |
self.user.set_password(newpass, "") |
| 219 |
os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name()) |
|
|
| 220 |
mask = self.group_mask.get_text() |
| 221 |
mask = mask.split(", ") |
| 222 |
mask.remove("nopasswdlogin") |
| 223 |
mask = ", ".join(mask) |
| 224 |
self.group_mask.set_text(mask) |
| 225 |
self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') |
218 |
self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') |
| 226 |
self.destroy() |
219 |
self.destroy() |
| 227 |
|
220 |
|
|
Lines 516-522
Link Here
|
| 516 |
model, treeiter = self.users_treeview.get_selection().get_selected() |
509 |
model, treeiter = self.users_treeview.get_selection().get_selected() |
| 517 |
if treeiter != None: |
510 |
if treeiter != None: |
| 518 |
user = model[treeiter][INDEX_USER_OBJECT] |
511 |
user = model[treeiter][INDEX_USER_OBJECT] |
| 519 |
dialog = PasswordDialog(user, self.password_mask, self.groups_label) |
512 |
dialog = PasswordDialog(user, self.password_mask) |
| 520 |
response = dialog.run() |
513 |
response = dialog.run() |
| 521 |
|
514 |
|
| 522 |
def _on_groups_button_clicked(self, widget): |
515 |
def _on_groups_button_clicked(self, widget): |
|
Lines 746-756
Link Here
|
| 746 |
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48) |
739 |
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48) |
| 747 |
description = "<b>%s</b>\n%s" % (fullname, username) |
740 |
description = "<b>%s</b>\n%s" % (fullname, username) |
| 748 |
piter = self.users.append(None, [new_user, pixbuf, description]) |
741 |
piter = self.users.append(None, [new_user, pixbuf, description]) |
| 749 |
# Add the user to his/her own group and sudo if Administrator was selected |
742 |
# Add the user to his/her own group and wheel if Administrator was selected |
| 750 |
if dialog.account_type_combo.get_active() == 1: |
743 |
if dialog.account_type_combo.get_active() == 1: |
| 751 |
os.system("usermod %s -G %s,sudo,nopasswdlogin" % (username, username)) |
744 |
os.system("usermod %s -G %s,wheel" % (username, username)) |
| 752 |
else: |
745 |
else: |
| 753 |
os.system("usermod %s -G %s,nopasswdlogin" % (username, username)) |
746 |
os.system("usermod %s -G %s" % (username, username)) |
| 754 |
self.load_groups() |
747 |
self.load_groups() |
| 755 |
dialog.destroy() |
748 |
dialog.destroy() |
| 756 |
|
749 |
|
