diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2009-05-14 23:38:51 -0700 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2009-05-14 23:38:51 -0700 |
| commit | 74db51676eb9cd6eda1f77d69e6b50e28e313bef (patch) | |
| tree | ff6134692da9efb5ac78b0b052111b45ff0acc93 | |
| parent | 9c6cf19e828b4d213a7c2bc904120763a9f713f2 (diff) | |
| download | connman-gnome-74db51676eb9cd6eda1f77d69e6b50e28e313bef.tar.gz | |
Escape the service name to avoid markup issues
| -rw-r--r-- | common/test-client.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/common/test-client.c b/common/test-client.c index 2584351..58f2211 100644 --- a/common/test-client.c +++ b/common/test-client.c @@ -92,8 +92,8 @@ static void service_to_text(GtkTreeViewColumn *column, GtkCellRenderer *cell, gchar *name; guint type, state, security; gboolean favorite; - gchar *markup; - const gchar *format, *str, *val; + gchar *markup, *str; + const gchar *format, *val; gtk_tree_model_get(model, iter, CONNMAN_COLUMN_NAME, &name, CONNMAN_COLUMN_TYPE, &type, @@ -109,11 +109,11 @@ static void service_to_text(GtkTreeViewColumn *column, GtkCellRenderer *cell, if (name == NULL) { if (type == CONNMAN_TYPE_WIFI) - str = "<i>hidden</i>"; + str = g_strdup("<i>hidden</i>"); else - str = type2str(type); + str = g_strdup(type2str(type)); } else - str = name; + str = g_markup_printf_escaped("%s", name); if (state == CONNMAN_STATE_UNKNOWN || state == CONNMAN_STATE_IDLE) val = NULL; @@ -125,6 +125,7 @@ static void service_to_text(GtkTreeViewColumn *column, GtkCellRenderer *cell, security2str(security)); g_object_set(cell, "markup", markup, NULL); g_free(markup); + g_free(str); g_free(name); } |