[Pspp-cvs] pspp/src/ui/gui psppire-data-store.c val-labs-d...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   06/12/12 06:44:49

Modified files:
        src/ui/gui     : psppire-data-store.c val-labs-dialog.c 

Log message:
        Fixed bugs which crept in with the variable encapsulation changes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-data-store.c?cvsroot=pspp&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/val-labs-dialog.c?cvsroot=pspp&r1=1.5&r2=1.6

Patches:
Index: psppire-data-store.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-data-store.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- psppire-data-store.c        10 Dec 2006 03:42:52 -0000      1.21
+++ psppire-data-store.c        12 Dec 2006 06:44:49 -0000      1.22
@@ -437,7 +437,7 @@
   
   case_create (&cc, val_cnt);
 
-  memset ( case_data_rw (&cc, 0), 0, val_cnt * MAX_SHORT_STRING);
+  memset ( case_data_rw_idx (&cc, 0), 0, val_cnt * MAX_SHORT_STRING);
 
   for (v = 0 ; v < psppire_dict_get_var_cnt (ds->dict) ; ++v) 
     {

Index: val-labs-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/val-labs-dialog.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- val-labs-dialog.c   10 Dec 2006 03:42:52 -0000      1.5
+++ val-labs-dialog.c   12 Dec 2006 06:44:49 -0000      1.6
@@ -451,11 +451,16 @@
 void 
 val_labs_dialog_show(struct val_labs_dialog *dialog)
 {
+  const struct val_labs *value_labels;
+
   g_assert(!dialog->labs);
-  dialog->labs = val_labs_copy(
-                              psppire_variable_get_value_labels(dialog->pv)
-                              );
 
+  value_labels = psppire_variable_get_value_labels (dialog->pv);
+
+  if (value_labels)
+    dialog->labs = val_labs_copy ( value_labels );
+  else
+    dialog->labs = val_labs_create ( psppire_variable_get_width (dialog->pv));
 
   gtk_widget_set_sensitive(dialog->remove_button, FALSE);
   gtk_widget_set_sensitive(dialog->change_button, FALSE);