X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-store.c;h=ef9d978dd211342b79c118025428db92bce12249;hb=48ec61d954cc032c773daf96851cf3b78f27b112;hp=bc348efa22db9dfc2bb19a3e438d15c018225cc0;hpb=a46ff9d9503e9db1298c896b5a219e402706eb38;p=pspp diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c index bc348efa22..ef9d978dd2 100644 --- a/src/ui/gui/psppire-var-store.c +++ b/src/ui/gui/psppire-var-store.c @@ -381,8 +381,8 @@ psppire_var_store_sheet_model_init (PsppireSheetModelIface *iface) /** * psppire_var_store_new: - * @dict: The dictionary for this var_store. - * + * @dict: The dictionary for this var_store. The caller retains its reference + * to @dict. * * Return value: a new #PsppireVarStore **/ @@ -447,7 +447,7 @@ psppire_var_store_dispose (GObject *object) g_object_unref (self->dictionary); /* must chain up */ - (* parent_class->finalize) (object); + (* parent_class->dispose) (object); } @@ -686,10 +686,14 @@ text_for_column (PsppireVarStore *vs, g_assert (vl); { + gchar *s; gchar *const vstr = value_to_text (vl->value, pv); - return g_strdup_printf (_("{%s,`%s'}_"), vstr, + s = g_strdup_printf (_("{%s,`%s'}_"), vstr, val_lab_get_escaped_label (vl)); + free (vstr); + + return s; } } }