summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2010-08-13 11:20:09 -0400
committerRay Strode <rstrode@redhat.com>2010-08-13 11:20:09 -0400
commitf9996fb5412beeef293b542c0640b69f1f7a0eaa (patch)
tree5d33142dbcacc89cea401e52970f622e5711bf55
parent49ab66dbd91fd980b294bcc72f7195efeae7a29a (diff)
downloadgdm-f9996fb5412beeef293b542c0640b69f1f7a0eaa.tar.gz
More username escape fixes
commit b2f79db8cee486964f562e818e2bf96a420e7965 fixed the "add_item" case but not the "update_item" case. This commit addresses that. http://bugzilla.gnome.org/show_bug.cgi?id=624847
-rw-r--r--gui/simple-greeter/gdm-user-chooser-widget.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
index b7bd0a0e..5f30160b 100644
--- a/gui/simple-greeter/gdm-user-chooser-widget.c
+++ b/gui/simple-greeter/gdm-user-chooser-widget.c
@@ -182,6 +182,8 @@ update_item_for_user (GdmUserChooserWidget *widget,
char *tooltip;
gboolean is_logged_in;
int size;
+ char *escaped_username;
+ char *escaped_real_name;
size = get_icon_height_for_widget (GTK_WIDGET (widget));
@@ -201,14 +203,18 @@ update_item_for_user (GdmUserChooserWidget *widget,
is_logged_in,
pixbuf);
+ escaped_username = g_markup_escape_text (gdm_user_get_user_name (user), -1);
+ escaped_real_name = g_markup_escape_text (gdm_user_get_real_name (user), -1);
gdm_chooser_widget_update_item (GDM_CHOOSER_WIDGET (widget),
- gdm_user_get_user_name (user),
+ escaped_username,
pixbuf,
- gdm_user_get_real_name (user),
+ escaped_real_name,
tooltip,
gdm_user_get_login_frequency (user),
is_logged_in,
FALSE);
+ g_free (escaped_real_name);
+ g_free (escaped_username);
g_free (tooltip);
if (pixbuf != NULL) {