projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
src
/
ui
/
gui
/
aggregate-dialog.c
diff --git
a/src/ui/gui/aggregate-dialog.c
b/src/ui/gui/aggregate-dialog.c
index 7a48fce850603eec83e7672ee92af4688cd19564..a5c243a8e2de40c5fa4f80d5f581248f471807a0 100644
(file)
--- a/
src/ui/gui/aggregate-dialog.c
+++ b/
src/ui/gui/aggregate-dialog.c
@@
-469,8
+469,6
@@
aggregate_dialog (PsppireDataWindow *dw)
struct aggregate fd;
gint response;
struct aggregate fd;
gint response;
- PsppireVarStore *vs;
-
GtkWidget *dialog ;
GtkWidget *source ;
GtkWidget *dialog ;
GtkWidget *source ;
@@
-566,11
+564,9
@@
aggregate_dialog (PsppireDataWindow *dw)
g_signal_connect_swapped (dialog, "refresh", G_CALLBACK (refresh), &fd);
g_signal_connect_swapped (dialog, "refresh", G_CALLBACK (refresh), &fd);
- g_object_get (fd.de->data_editor, "var-store", &vs, NULL);
-
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (fd.de));
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (fd.de));
- g_object_get (
vs
, "dictionary", &fd.dict, NULL);
+ g_object_get (
fd.de->data_editor
, "dictionary", &fd.dict, NULL);
g_object_set (source, "model", fd.dict, NULL);
g_object_set (source, "model", fd.dict, NULL);
@@
-635,8
+631,8
@@
static void
append_summary_spec (const struct aggregate *agg, GtkTreeIter *iter, GString *string)
{
GtkTreeIter combo_iter;
append_summary_spec (const struct aggregate *agg, GtkTreeIter *iter, GString *string)
{
GtkTreeIter combo_iter;
- c
onst char *varname
;
- c
onst char *funcname
;
+ c
har *varname = NULL
;
+ c
har *funcname = NULL
;
GtkTreeModel *acr_model = GTK_TREE_MODEL (PSPPIRE_ACR (agg->summary_acr)->list_store);
GtkTreeModel *combo_model = gtk_combo_box_get_model (GTK_COMBO_BOX (agg->function_combo));
GtkTreeModel *acr_model = GTK_TREE_MODEL (PSPPIRE_ACR (agg->summary_acr)->list_store);
GtkTreeModel *combo_model = gtk_combo_box_get_model (GTK_COMBO_BOX (agg->function_combo));
@@
-647,8
+643,8
@@
append_summary_spec (const struct aggregate *agg, GtkTreeIter *iter, GString *st
double arg1, arg2;
int arity;
enum agr_src_vars has_src_vars;
double arg1, arg2;
int arity;
enum agr_src_vars has_src_vars;
-
const gchar *label
;
-
const gchar *srcvar
;
+
gchar *label = NULL
;
+
gchar *srcvar = NULL
;
gtk_tree_model_get (acr_model, iter,
SUMMARY_COL_VARNAME, &varname,
gtk_tree_model_get (acr_model, iter,
SUMMARY_COL_VARNAME, &varname,
@@
-695,6
+691,11
@@
append_summary_spec (const struct aggregate *agg, GtkTreeIter *iter, GString *st
g_string_append (string, ")");
}
g_string_append (string, ")");
}
+
+ free (label);
+ free (srcvar);
+ free (varname);
+ free (funcname);
}
}