cleanup

[pspp] / src / ui / gui / missing-val-dialog.c

diff --git a/src/ui/gui/missing-val-dialog.c b/src/ui/gui/missing-val-dialog.c
index 8d9fda759b8146a145257db7d7c97071907550d3..3ee221d7613a45ccac3a39ba763fefd421fcc8c5 100644 (file)
--- a/src/ui/gui/missing-val-dialog.c
+++ b/src/ui/gui/missing-val-dialog.c
@@ -1,5 +1,6 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2005, 2006, 2009, 2011, 2012, 2015, 2016  Free Software Foundation
+   Copyright (C) 2005, 2006, 2009, 2011, 2012, 2015, 2016,
+   2020  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
@@ -195,12 +196,13 @@ err_dialog (const gchar *msg, GtkWindow *window)
 static gboolean
 try_missing_value(const PsppireMissingValDialog *dialog, const gchar *text, union value *vp)
 {
-  const int var_width = fmt_var_width (&dialog->format);
+  const int var_width = fmt_var_width (dialog->format);
   char *error_txt = NULL;
 
   value_init(vp, var_width);
   error_txt = data_in (ss_cstr(text), "UTF-8", dialog->format.type,
-                      vp, var_width, dialog->encoding);
+                       settings_get_fmt_settings (), vp, var_width,
+                       dialog->encoding);
   if (error_txt)
     {
       err_dialog (error_txt, GTK_WINDOW (dialog));
@@ -231,7 +233,7 @@ static gboolean
 missing_val_dialog_acceptable (gpointer data)
 {
   PsppireMissingValDialog *dialog = data;
-  int var_width = fmt_var_width (&dialog->format);
+  int var_width = fmt_var_width (dialog->format);
 
   if (gtk_toggle_button_get_active (dialog->button_discrete))
     {
@@ -374,6 +376,9 @@ psppire_missing_val_dialog_constructor (GType                  type,
     type, n_properties, properties);
   dialog = PSPPIRE_MISSING_VAL_DIALOG (obj);
 
+  g_object_set (dialog, "help-page", "Missing-Observations",
+               "title", _("Missing Values"), NULL);
+
   content_area = GTK_CONTAINER (PSPPIRE_DIALOG (dialog));
   xml = builder_new ("missing-val-dialog.ui");
   gtk_container_add (GTK_CONTAINER (content_area),
@@ -430,7 +435,7 @@ psppire_missing_val_dialog_set_variable (PsppireMissingValDialog *dialog,
       else
        mv_copy (&dialog->mvl, vmv);
       dialog->encoding = g_strdup (var_get_encoding (var));
-      dialog->format = *var_get_print_format (var);
+      dialog->format = var_get_print_format (var);
     }
   else
     {
@@ -447,7 +452,7 @@ psppire_missing_val_dialog_set_variable (PsppireMissingValDialog *dialog,
   gtk_widget_set_sensitive (dialog->high, FALSE);
   gtk_widget_set_sensitive (dialog->discrete, FALSE);
 
-  var_type = val_type_from_width (fmt_var_width (&dialog->format));
+  var_type = val_type_from_width (fmt_var_width (dialog->format));
   gtk_widget_set_sensitive (GTK_WIDGET (dialog->button_range),
                            var_type == VAL_NUMERIC);
 
@@ -468,8 +473,8 @@ psppire_missing_val_dialog_set_variable (PsppireMissingValDialog *dialog,
       mv_get_range (&dialog->mvl, &low.f, &high.f);
 
 
-      low_text = value_to_text__ (low, &dialog->format, dialog->encoding);
-      high_text = value_to_text__ (high, &dialog->format, dialog->encoding);
+      low_text = value_to_text__ (low, dialog->format, dialog->encoding);
+      high_text = value_to_text__ (high, dialog->format, dialog->encoding);
 
       gtk_entry_set_text (GTK_ENTRY (dialog->low), low_text);
       gtk_entry_set_text (GTK_ENTRY (dialog->high), high_text);
@@ -480,7 +485,7 @@ psppire_missing_val_dialog_set_variable (PsppireMissingValDialog *dialog,
        {
          gchar *text;
          text = value_to_text__ (*mv_get_value (&dialog->mvl, 0),
-                                  &dialog->format, dialog->encoding);
+                                  dialog->format, dialog->encoding);
          gtk_entry_set_text (GTK_ENTRY (dialog->discrete), text);
          g_free (text);
        }
@@ -502,7 +507,7 @@ psppire_missing_val_dialog_set_variable (PsppireMissingValDialog *dialog,
              gchar *text ;
 
              text = value_to_text__ (*mv_get_value (&dialog->mvl, i),
-                                      &dialog->format, dialog->encoding);
+                                      dialog->format, dialog->encoding);
              gtk_entry_set_text (GTK_ENTRY (dialog->mv[i]), text);
              g_free (text);
            }