Merge pull request #561 from oltulu/patch-349

Update set_wheel.patch
This commit is contained in:
Milli İşletim Sistemi (Milis Linux) 2018-05-12 00:56:03 +03:00 committed by GitHub
commit bfe4881085
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions

View File

@ -1,17 +1,17 @@
--- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
@@ -153,12 +153,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)
@@ -224,14 +223,7 @@
@ -25,10 +25,10 @@
- mask.remove("nopasswdlogin")
- mask = ", ".join(mask)
- self.group_mask.set_text(mask)
- self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
+ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
- self.password_mask.set_text('\u2022\u2022\u2022\u2022\u2022\u2022')
+ self.password_mask.set_text('\u2022\u2022\u2022\u2022\u2022\u2022')
self.destroy()
def set_passwords_visibility(self):
@@ -563,7 +555,7 @@
model, treeiter = self.users_treeview.get_selection().get_selected()
@ -37,7 +37,7 @@
- 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):
@@ -807,11 +799,11 @@
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
@ -53,4 +53,3 @@
+ subprocess.call(["usermod", username, "-G", "%s" % username])
self.load_groups()
dialog.destroy()