set_wheel.patch

   1 --- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
   2 +++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
   3 @@ -144,12 +144,11 @@ class EditableEntry (Gtk.Notebook):
   4
   5  class PasswordDialog(Gtk.Dialog):
   6
   7 -    def __init__ (self, user, password_mask, group_mask):
   8 +    def __init__ (self, user, password_mask):
   9          super(PasswordDialog, self).__init__()
  10
  11          self.user = user
  12          self.password_mask = password_mask
  13 -        self.group_mask = group_mask
  14
  15          self.set_modal(True)
  16          self.set_skip_taskbar_hint(True)
  17 @@ -215,12 +214,6 @@ class PasswordDialog(Gtk.Dialog):
  18      def change_password(self):
  19          newpass = self.new_password.get_text()
  20          self.user.set_password(newpass, "")
  21 -        os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
  22 -        mask = self.group_mask.get_text()
  23 -        mask = mask.split(", ")
  24 -        mask.remove("nopasswdlogin")
  25 -        mask = ", ".join(mask)
  26 -        self.group_mask.set_text(mask)
  27          self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
  28          self.destroy()
  29
  30 @@ -515,7 +508,7 @@ class Module:
  31          model, treeiter = self.users_treeview.get_selection().get_selected()
  32          if treeiter != None:
  33              user = model[treeiter][INDEX_USER_OBJECT]
  34 -            dialog = PasswordDialog(user, self.password_mask, self.groups_label)
  35 +            dialog = PasswordDialog(user, self.password_mask)
  36              response = dialog.run()
  37
  38      def _on_groups_button_clicked(self, widget):
  39 @@ -745,11 +738,11 @@ class Module:
  40              pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
  41              description = "<b>%s</b>\n%s" % (fullname, username)
  42              piter = self.users.append(None, [new_user, pixbuf, description])
  43 -            # Add the user to his/her own group and sudo if Administrator was selected
  44 +            # Add the user to his/her own group and wheel if Administrator was selected
  45              if dialog.account_type_combo.get_active() == 1:
  46 -                os.system("usermod %s -G %s,sudo,nopasswdlogin" % (username, username))
  47 +                os.system("usermod %s -G %s,wheel" % (username, username))
  48              else:
  49 -                os.system("usermod %s -G %s,nopasswdlogin" % (username, username))
  50 +                os.system("usermod %s -G %s" % (username, username))
  51              self.load_groups()
  52          dialog.destroy()
  53