projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly display ampersand characters in dictionary view widgets
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire-dictview.c
diff --git
a/src/ui/gui/psppire-dictview.c
b/src/ui/gui/psppire-dictview.c
index 37539694b138c109fbe6692628e3009dd62e35e9..f1a168de9f39081dc4110f03a9943d54bf0531e7 100644
(file)
--- a/
src/ui/gui/psppire-dictview.c
+++ b/
src/ui/gui/psppire-dictview.c
@@
-336,23
+336,16
@@
var_description_cell_data_func (GtkTreeViewColumn *col,
if ( var_has_label (var) && dv->prefer_labels)
{
if ( var_has_label (var) && dv->prefer_labels)
{
- gchar *text = g_
strdup_printf
(
+ gchar *text = g_
markup_printf_escaped
(
"<span stretch=\"condensed\">%s</span>",
var_get_label (var));
"<span stretch=\"condensed\">%s</span>",
var_get_label (var));
- char *utf8 = recode_string (UTF8, psppire_dict_encoding (dict),
- text, -1);
-
+ g_object_set (cell, "markup", text, NULL);
g_free (text);
g_free (text);
- g_object_set (cell, "markup", utf8, NULL);
- g_free (utf8);
}
else
{
}
else
{
- char *name = recode_string (UTF8, psppire_dict_encoding (dict),
- var_get_name (var), -1);
- g_object_set (cell, "text", name, NULL);
- g_free (name);
+ g_object_set (cell, "text", var_get_name (var), NULL);
}
}
}
}
@@
-439,7
+432,7
@@
set_tooltip_for_variable (GtkTreeView *treeview,
return FALSE;
{
return FALSE;
{
- gchar *tip ;
+
const
gchar *tip ;
GtkTreeModel *m;
PsppireDict *dict;
GtkTreeModel *m;
PsppireDict *dict;
@@
-447,15
+440,11
@@
set_tooltip_for_variable (GtkTreeView *treeview,
dict = PSPPIRE_DICT (m);
if ( PSPPIRE_DICT_VIEW (treeview)->prefer_labels )
dict = PSPPIRE_DICT (m);
if ( PSPPIRE_DICT_VIEW (treeview)->prefer_labels )
- tip = recode_string (UTF8, psppire_dict_encoding (dict),
- var_get_name (var), -1);
+ tip = var_get_name (var);
else
else
- tip = recode_string (UTF8, psppire_dict_encoding (dict),
- var_get_label (var), -1);
+ tip = var_get_label (var);
gtk_tooltip_set_text (tooltip, tip);
gtk_tooltip_set_text (tooltip, tip);
-
- g_free (tip);
}
return TRUE;
}
return TRUE;
@@
-523,7
+512,10
@@
psppire_dict_view_init (PsppireDictView *dict_view)
gtk_tree_view_append_column (GTK_TREE_VIEW (dict_view), col);
gtk_tree_view_append_column (GTK_TREE_VIEW (dict_view), col);
- g_object_set (dict_view, "has-tooltip", TRUE, NULL);
+ g_object_set (dict_view,
+ "has-tooltip", TRUE,
+ "headers-visible", FALSE,
+ NULL);
g_signal_connect (dict_view, "query-tooltip",
G_CALLBACK (set_tooltip_for_variable), NULL);
g_signal_connect (dict_view, "query-tooltip",
G_CALLBACK (set_tooltip_for_variable), NULL);