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 7348cd5ed2bebf6220141c6134c3fb9b64293054..8b54ed584afe84798b8475e46295bed1b66060fa 100644 (file)
--- a/src/ui/gui/aggregate-dialog.c
+++ b/src/ui/gui/aggregate-dialog.c
@@ -93,15 +93,6 @@ struct aggregate
 static char * generate_syntax (const struct aggregate *rd);
 
 
-/* Makes widget W's sensitivity follow the active state of TOGGLE */
-static void
-sensitive_if_active (GtkToggleButton *toggle, GtkWidget *w)
-{
-  gboolean active = gtk_toggle_button_get_active (toggle);
-
-  gtk_widget_set_sensitive (w, active);
-}
-
 static void update_arguments (struct aggregate *agg);
 
 
@@ -577,7 +568,7 @@ aggregate_dialog (PsppireDataWindow *dw)
                                      dialog_state_valid, &fd);
 
   g_signal_connect (fd.filename_radiobutton, "toggled",
-                   G_CALLBACK (sensitive_if_active), fd.filename_box );
+                   G_CALLBACK (set_sensitivity_from_toggle), fd.filename_box );
 
   g_signal_connect_swapped (fd.filename_button, "clicked",
                    G_CALLBACK (choose_filename), &fd);
@@ -631,8 +622,8 @@ static void
 append_summary_spec (const struct aggregate *agg, GtkTreeIter *iter, GString *string)
 {
   GtkTreeIter combo_iter;
-  const char *varname;
-  const char *funcname;
+  char *varname = NULL;
+  char *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));
@@ -643,8 +634,8 @@ append_summary_spec (const struct aggregate *agg, GtkTreeIter *iter, GString *st
   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,
@@ -691,6 +682,11 @@ append_summary_spec (const struct aggregate *agg, GtkTreeIter *iter, GString *st
 
       g_string_append (string, ")");
     }
+
+   free (label);
+   free (srcvar);
+   free (varname);
+   free (funcname);
 }