diff options
| author | Ray Strode <rstrode@redhat.com> | 2010-07-20 14:29:17 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2010-07-20 14:29:17 -0400 |
| commit | 86f6b36dce3de4a6768d8c9c8c31d236df45ee7a (patch) | |
| tree | 62baf36f10676cf4d598b006c760f71dfdd0050d | |
| parent | baf91fafe6aaf00697098cd569b8ee4c95d81c41 (diff) | |
| download | gdm-86f6b36dce3de4a6768d8c9c8c31d236df45ee7a.tar.gz | |
Revert "Escape names before showing in markup"
This reverts commit b4a1d0e19b22714719bdf0560b1db4ff1b43042b.
The chooser widget is used by the language chooser as well.
https://bugzilla.gnome.org/show_bug.cgi?id=624847
| -rw-r--r-- | gui/simple-greeter/gdm-chooser-widget.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c index fd97cdb6..d4b0a4a4 100644 --- a/gui/simple-greeter/gdm-chooser-widget.c +++ b/gui/simple-greeter/gdm-chooser-widget.c @@ -1649,7 +1649,6 @@ name_cell_data_func (GtkTreeViewColumn *tree_column, { gboolean is_in_use; char *name; - char *escaped; char *markup; name = NULL; @@ -1658,22 +1657,15 @@ name_cell_data_func (GtkTreeViewColumn *tree_column, CHOOSER_ITEM_IS_IN_USE_COLUMN, &is_in_use, CHOOSER_NAME_COLUMN, &name, -1); - if (name != NULL) { - escaped = g_markup_escape_text (name, -1); - g_free (name); - } else { - escaped = NULL; - } if (is_in_use) { markup = g_strdup_printf ("<b>%s</b>\n" "<i><span size=\"x-small\">%s</span></i>", - escaped != NULL ? escaped : "(none)", - widget->priv->in_use_message); + name ? name : "(null)", widget->priv->in_use_message); } else { - markup = g_strdup_printf ("%s", escaped != NULL ? escaped : "(none)"); + markup = g_strdup_printf ("%s", name ? name : "(null)"); } - g_free (escaped); + g_free (name); g_object_set (cell, "markup", markup, NULL); g_free (markup); |