[gdm] Revert "Escape names before showing in markup"
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm] Revert "Escape names before showing in markup"
- Date: Tue, 20 Jul 2010 18:40:58 +0000 (UTC)
commit 933585a0da275c7c52c510edcce6b7d70010788f
Author: Ray Strode <rstrode redhat com>
Date: Tue Jul 20 14:38:09 2010 -0400
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
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 f67a811..9e3ae73 100644
--- a/gui/simple-greeter/gdm-chooser-widget.c
+++ b/gui/simple-greeter/gdm-chooser-widget.c
@@ -1658,7 +1658,6 @@ name_cell_data_func (GtkTreeViewColumn *tree_column,
{
gboolean is_in_use;
char *name;
- char *escaped;
char *markup;
name = NULL;
@@ -1667,22 +1666,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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]