Skip to content

Commit

Permalink
cinnamon-settings-users: Fix special characters in pango markup
Browse files Browse the repository at this point in the history
  • Loading branch information
clefebvre committed Dec 11, 2023
1 parent 07c8dde commit 0f0a8be
Showing 1 changed file with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ def _on_realname_changed(self, widget, text):
if treeiter is not None:
user = model[treeiter][INDEX_USER_OBJECT]
user.set_real_name(text)
description = "<b>%s</b>\n%s" % (text, user.get_user_name())
description = "<b>%s</b>\n%s" % (GLib.markup_escape_text(text), GLib.markup_escape_text(user.get_user_name()))
model.set_value(treeiter, INDEX_USER_DESCRIPTION, description)

def _on_face_browse_menuitem_activated(self, menuitem):
Expand Down Expand Up @@ -777,7 +777,10 @@ def load_users(self):
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(user.get_icon_file(), 48, 48)
else:
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
description = "<b>%s</b>\n%s" % (user.get_real_name(), user.get_user_name())

real_name = GLib.markup_escape_text(user.get_real_name())
user_name = GLib.markup_escape_text(user.get_user_name())
description = f"<b>{real_name}</b>\n{user_name}"
piter = self.users.append(None, [user, pixbuf, description])
self.users_treeview.set_model(self.users)

Expand Down Expand Up @@ -897,7 +900,7 @@ def on_user_addition(self, event):
new_user = self.accountService.create_user(username, fullname, account_type)
new_user.set_password_mode(AccountsService.UserPasswordMode.NONE)
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
if dialog.account_type_combo.get_active() == 1:
Expand Down

0 comments on commit 0f0a8be

Please sign in to comment.