gui: Remove write-only variable 'new_type' from on_var_type_ok_clicked().

[pspp-builds.git] / src / ui / gui / var-type-dialog.c

diff --git a/src/ui/gui/var-type-dialog.c b/src/ui/gui/var-type-dialog.c
index c433bf3b2535e080e926093b2be5193c1760a252..5ba028d49e5887e6a3f95621e18c88789fcb9211 100644 (file)
--- a/src/ui/gui/var-type-dialog.c
+++ b/src/ui/gui/var-type-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-    Copyright (C) 2005, 2006  Free Software Foundation
+    Copyright (C) 2005, 2006, 2010  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
@@ -262,12 +262,12 @@ preview_custom (GtkWidget *w, gpointer data)
       union value v;
       v.f = 1234.56;
 
-      sample_text = value_to_text (v, dialog->fmt_l);
+      sample_text = value_to_text (v, NULL, dialog->fmt_l);
       gtk_label_set_text (GTK_LABEL (dialog->label_psample), sample_text);
       g_free (sample_text);
 
       v.f = -v.f;
-      sample_text = value_to_text (v, dialog->fmt_l);
+      sample_text = value_to_text (v, NULL, dialog->fmt_l);
       gtk_label_set_text (GTK_LABEL (dialog->label_nsample), sample_text);
       g_free (sample_text);
     }
@@ -445,7 +445,7 @@ var_type_dialog_create (GtkWindow *toplevel)
   g_object_unref (list_store);
 
   g_signal_connect (dialog->date_format_treeview, "cursor-changed",
-                  GTK_SIGNAL_FUNC (set_format_from_treeview), dialog);
+                  G_CALLBACK (set_format_from_treeview), dialog);
 
 
   /* populate the dollar treeview */
@@ -483,11 +483,11 @@ var_type_dialog_create (GtkWindow *toplevel)
 
   g_signal_connect (dialog->dollar_treeview,
                   "cursor-changed",
-                  GTK_SIGNAL_FUNC (set_format_from_treeview), dialog);
+                  G_CALLBACK (set_format_from_treeview), dialog);
 
   g_signal_connect_swapped (dialog->dollar_treeview,
                   "cursor-changed",
-                  GTK_SIGNAL_FUNC (update_width_decimals), dialog);
+                  G_CALLBACK (update_width_decimals), dialog);
 
 
   /* populate the custom treeview */
@@ -527,22 +527,22 @@ var_type_dialog_create (GtkWindow *toplevel)
 
   g_signal_connect (dialog->custom_treeview,
                   "cursor-changed",
-                  GTK_SIGNAL_FUNC (set_format_type_from_treeview), dialog);
+                  G_CALLBACK (set_format_type_from_treeview), dialog);
 
 
   g_signal_connect (dialog->custom_treeview,
                   "cursor-changed",
-                  GTK_SIGNAL_FUNC (preview_custom), dialog);
+                  G_CALLBACK (preview_custom), dialog);
 
 
   g_signal_connect (dialog->entry_width,
                   "changed",
-                  GTK_SIGNAL_FUNC (preview_custom), dialog);
+                  G_CALLBACK (preview_custom), dialog);
 
 
   g_signal_connect (dialog->entry_decimals,
                   "changed",
-                  GTK_SIGNAL_FUNC (preview_custom), dialog);
+                  G_CALLBACK (preview_custom), dialog);
 
 
   /* Connect to the OK button */
@@ -790,14 +790,12 @@ on_var_type_ok_clicked (GtkWidget *w, gpointer data)
     gint decimals = atoi (gtk_entry_get_text
                         (GTK_ENTRY (dialog->entry_decimals)));
 
-    gint new_type = VAL_NUMERIC;
     gint new_width = 0;
     bool result = false;
     struct fmt_spec spec;
     switch (dialog->active_button)
       {
       case BUTTON_STRING:
-       new_type = VAL_STRING;
        new_width = width;
        result = make_output_format_try (&spec, FMT_A, width, 0);
        break;