Merge remote branch 'origin/master' into import-gui

[pspp] / src / ui / gui / psppire-var-store.c

diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c
index f924c17027fbf3c78547e63271fb4e38477ad4b4..ef9d978dd211342b79c118025428db92bce12249 100644 (file)
--- a/src/ui/gui/psppire-var-store.c
+++ b/src/ui/gui/psppire-var-store.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2006, 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2006, 2009, 2010, 2011, 2012  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -52,7 +52,8 @@ var_change_callback (GtkWidget *w, gint n, gpointer data)
 
 
 static void
-var_delete_callback (GtkWidget *w, gint dict_idx, gint case_idx, gint val_cnt, gpointer data)
+var_delete_callback (GtkWidget *w, const struct variable *var UNUSED,
+                     gint dict_idx, gint case_idx UNUSED, gpointer data)
 {
   PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data);
 
@@ -380,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
  **/
@@ -446,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);
 }
 
 
@@ -685,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;
            }
          }
       }