- updated to 6.0.4 (translations 6.0.2)

[packages/cinnamon.git] / set_wheel.patch

diff --git a/set_wheel.patch b/set_wheel.patch
index 32dae0738611874e06a068b39d53f36ac1af4807..59c614a8c6d15af3a81715fc499e8ae180673df1 100644 (file)
--- a/set_wheel.patch
+++ b/set_wheel.patch
@@ -1,8 +1,6 @@
-Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-===================================================================
---- Cinnamon-3.6.6.orig/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-+++ Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -153,12 +153,11 @@
+--- cinnamon-6.0.4/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig    2024-01-04 19:09:30.000000000 +0100
++++ cinnamon-6.0.4/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2024-05-06 18:21:48.401257121 +0200
+@@ -182,12 +182,11 @@ class EditableEntry (Gtk.Notebook):
  
  class PasswordDialog(Gtk.Dialog):
  
@@ -16,7 +14,7 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-
  
          self.set_modal(True)
          self.set_skip_taskbar_hint(True)
-@@ -224,14 +223,7 @@
+@@ -253,14 +252,7 @@ class PasswordDialog(Gtk.Dialog):
      def change_password(self):
          newpass = self.new_password.get_text()
          self.user.set_password(newpass, "")
@@ -32,18 +30,18 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-
          self.destroy()
  
      def set_passwords_visibility(self):
-@@ -570,7 +562,7 @@
+@@ -613,7 +605,7 @@ class Module:
          model, treeiter = self.users_treeview.get_selection().get_selected()
-         if treeiter != None:
+         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):
-@@ -839,11 +831,11 @@
+@@ -902,11 +894,11 @@ class Module:
              pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
-             description = "<b>%s</b>\n%s" % (fullname, username)
+             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
@@ -56,4 +54,3 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-
              self.load_groups()
          dialog.destroy()
  
-