X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-sheet.c;h=70e1044fcb25ed9d46dbc2fcc8d2232c3687fda6;hb=27b5e5cbc5517702d5660e2120013aa80ed6f97b;hp=dfd62bb6737f1dbc78a605a6aaf62e2e7189a757;hpb=83df73bacd2cd3abd177e6a8ac1b76b072255025;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c
index dfd62bb6..70e1044f 100644
--- a/src/ui/gui/psppire-var-sheet.c
+++ b/src/ui/gui/psppire-var-sheet.c
@@ -251,6 +251,9 @@ traverse_cell_callback (PsppireSheet *sheet,
 
   gint n_vars = psppire_var_store_get_var_cnt (var_store);
 
+  if (new_cell->col >=  PSPPIRE_VAR_STORE_n_COLS)
+    return TRUE;
+
   if (new_cell->row >= n_vars && !var_sheet->may_create_vars)
     return TRUE;
 
@@ -260,10 +263,10 @@ traverse_cell_callback (PsppireSheet *sheet,
 
       const gchar *name = gtk_entry_get_text (entry);
 
-      if (! psppire_dict_check_name (var_store->dict, name, TRUE))
+      if (! psppire_dict_check_name (var_store->dictionary, name, TRUE))
 	return TRUE;
 
-      psppire_dict_insert_variable (var_store->dict, existing_cell->row, name);
+      psppire_dict_insert_variable (var_store->dictionary, existing_cell->row, name);
 
       return FALSE;
     }
@@ -278,7 +281,7 @@ traverse_cell_callback (PsppireSheet *sheet,
     {
       gint i;
       for ( i = n_vars ; i <= new_cell->row; ++i )
-	psppire_dict_insert_variable (var_store->dict, i, NULL);
+	psppire_dict_insert_variable (var_store->dictionary, i, NULL);
     }
 
   return FALSE;
@@ -384,7 +387,7 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
 	vs->missing_val_dialog->pv =
 	  psppire_var_store_get_var (var_store, row);
 
-	vs->missing_val_dialog->dict = var_store->dict;
+	vs->missing_val_dialog->dict = var_store->dictionary;
 
 	g_signal_connect_swapped (customEntry,
 				  "clicked",