X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-autorecode.c;h=2f1bdcbecbe7986ebd12e7b984b4d69bcd4fd0f6;hb=e7913c62251710319b06c50702c5db9afb612be5;hp=7389976a3c5d011ee053052ff7f2aea35dbac3d9;hpb=1c59b7647586c806fb5bd6012dcc5624868c707d;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-autorecode.c b/src/ui/gui/psppire-dialog-action-autorecode.c
index 7389976a3c..2f1bdcbecb 100644
--- a/src/ui/gui/psppire-dialog-action-autorecode.c
+++ b/src/ui/gui/psppire-dialog-action-autorecode.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include "psppire-dialog.h"
 #include "builder-wrapper.h"
+#include "helper.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -68,7 +69,7 @@ refresh (PsppireDialogAction *pda)
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->group), FALSE);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->blank), FALSE);
 
-  if (rd->varmap )
+  if (rd->varmap)
     g_hash_table_remove_all (rd->varmap);
 
   gtk_list_store_clear (GTK_LIST_STORE (target_list));
@@ -92,7 +93,7 @@ nlp_create (const char *name, const char *label)
 
   nlp->label = NULL;
 
-  if ( label != NULL && 0 != strcmp ("", label))
+  if (label != NULL && 0 != strcmp ("", label))
     nlp->label = g_strdup (label);
 
   return nlp;
@@ -102,7 +103,7 @@ static void
 nlp_destroy (gpointer data)
 {
   struct nlp *nlp = data ;
-  if ( ! nlp )
+  if (! nlp)
     return;
 
   g_free (nlp->name);
@@ -142,13 +143,13 @@ generate_syntax (const PsppireDialogAction *act)
     g_string_append (string, nlp->name);
   }
 
-  if ( ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->ascending)))
+  if (! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->ascending)))
     g_string_append (string, "\n\t/DESCENDING");
 
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->group)))
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->group)))
     g_string_append (string, "\n\t/GROUP");
 
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->blank)))
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->blank)))
     g_string_append (string, "\n\t/BLANK = MISSING");
 
   g_string_append (string, ".\n");
@@ -176,7 +177,7 @@ on_change_clicked (GObject *obj, gpointer data)
   const gchar *dest_var_name =
     gtk_entry_get_text (GTK_ENTRY (rd->new_name_entry));
 
-  if ( NULL == rows || rows->next != NULL)
+  if (NULL == rows || rows->next != NULL)
     goto finish;
 
   gtk_tree_model_get_iter (model, &iter, rows->data);
@@ -192,8 +193,9 @@ on_change_clicked (GObject *obj, gpointer data)
   gtk_tree_model_row_changed (model, rows->data, &iter);
 
  finish:
-  g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL);
+  g_list_foreach (rows, GFUNC_COMPAT_CAST (gtk_tree_path_free), NULL);
   g_list_free (rows);
+  var_unref (var);
 }
 
 
@@ -203,9 +205,9 @@ on_entry_change (PsppireDialogActionAutorecode *rd)
   gboolean valid = TRUE;
   const char *text = gtk_entry_get_text (GTK_ENTRY (rd->new_name_entry));
 
-  if ( 0 == strcmp ("", text))
+  if (0 == strcmp ("", text))
     valid = FALSE;
-  else if (psppire_dict_lookup_var (rd->dict, text))
+  else if (psppire_dict_lookup_var (PSPPIRE_DIALOG_ACTION (rd)->dict, text))
     valid = FALSE;
   else
     {
@@ -217,7 +219,7 @@ on_entry_change (PsppireDialogActionAutorecode *rd)
 	{
 	  struct nlp *nlp = value;
 
-	  if ( 0 == strcmp (nlp->name, text))
+	  if (0 == strcmp (nlp->name, text))
 	    {
 	      valid = FALSE;
 	      break;
@@ -243,7 +245,7 @@ on_selection_change (GtkTreeSelection *selection, gpointer data)
 
   GList *rows = gtk_tree_selection_get_selected_rows (selection, &model);
 
-  if ( rows && !rows->next)
+  if (rows && !rows->next)
     {
       /* Exactly one row is selected */
       struct nlp *nlp;
@@ -274,7 +276,7 @@ on_selection_change (GtkTreeSelection *selection, gpointer data)
       gtk_widget_set_sensitive  (rd->change_button, FALSE);
     }
 
-  g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL);
+  g_list_foreach (rows, GFUNC_COMPAT_CAST (gtk_tree_path_free), NULL);
   g_list_free (rows);
 }
 
@@ -301,7 +303,7 @@ render_new_var_name (GtkTreeViewColumn *tree_column,
 
   nlp = g_hash_table_lookup (rd->varmap, var);
 
-  if ( nlp )
+  if (nlp)
     g_object_set (cell, "text", nlp->name, NULL);
   else
     g_object_set (cell, "text", "", NULL);