X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fval-labs-dialog.c;h=a17d8e10f059101f1168d79521013d08f4a2fa97;hb=92f198d13c9214c0d75b936f0ea0dc2684ea914b;hp=c8be70b9f8a9221f9a714ecfe6df5e4f2b9e4531;hpb=573068f2bdcd3f8796e9646668fed910a90f890b;p=pspp-builds.git diff --git a/src/ui/gui/val-labs-dialog.c b/src/ui/gui/val-labs-dialog.c index c8be70b9..a17d8e10 100644 --- a/src/ui/gui/val-labs-dialog.c +++ b/src/ui/gui/val-labs-dialog.c @@ -271,6 +271,7 @@ static void on_select_row (GtkTreeView *treeview, gpointer data) { + gchar *labeltext; struct val_labs_dialog *dialog = data; struct val_lab * vl = get_selected_tuple(dialog); @@ -290,8 +291,10 @@ on_select_row (GtkTreeView *treeview, g_signal_handler_block(GTK_ENTRY(dialog->label_entry), dialog->change_handler_id); + labeltext = pspp_locale_to_utf8(vl->label, -1, 0); gtk_entry_set_text(GTK_ENTRY(dialog->label_entry), - vl->label); + labeltext); + g_free(labeltext); g_signal_handler_unblock(GTK_ENTRY(dialog->label_entry), dialog->change_handler_id); @@ -412,21 +415,25 @@ repopulate_dialog(struct val_labs_dialog *dialog) vl; vl = val_labs_next(dialog->labs, &vli)) { + gchar *const vstr = value_to_text(vl->value, *psppire_variable_get_write_spec(dialog->pv)); + gchar *labeltext = + pspp_locale_to_utf8(vl->label, -1, 0); - gchar *const text = g_strdup_printf("%s = \"%s\"", - vstr, vl->label); - + vstr, labeltext); + + gtk_list_store_append (list_store, &iter); gtk_list_store_set (list_store, &iter, 0, text, 1, vl->value.f, -1); + g_free(labeltext); g_free(text); g_free(vstr); }