X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fval-labs-dialog.c;h=14eacabfadddb5842e81f444855233b0e903ec03;hb=66153a44d861ccddf6a176ec5a94ffb959232ad6;hp=765be7fd16d71765cf59322f0f5e7370af66c8c2;hpb=04b418d95b3a0394fc7726087be7fa331d98b944;p=pspp-builds.git

diff --git a/src/ui/gui/val-labs-dialog.c b/src/ui/gui/val-labs-dialog.c
index 765be7fd..14eacabf 100644
--- a/src/ui/gui/val-labs-dialog.c
+++ b/src/ui/gui/val-labs-dialog.c
@@ -35,6 +35,7 @@ struct val_labs_dialog
   GtkWidget *window;
 
   PsppireVarStore *var_store;
+  PsppireDict *dict;
 
   /* The variable to be updated */
   struct variable *pv;
@@ -71,10 +72,10 @@ on_label_entry_change (GtkEntry *entry, gpointer data)
 
   text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
 
-  text_to_value (text, &v,
-		 dialog->var_store->dict,
-		*var_get_write_format (dialog->pv));
-
+  text_to_value (text,
+		 dialog->dict,
+		 dialog->pv,
+		 &v);
 
   if (val_labs_find (dialog->labs, &v))
     {
@@ -86,6 +87,8 @@ on_label_entry_change (GtkEntry *entry, gpointer data)
       gtk_widget_set_sensitive (dialog->change_button, FALSE);
       gtk_widget_set_sensitive (dialog->add_button, TRUE);
     }
+
+  value_destroy (&v, var_get_width (dialog->pv));
 }
 
 
@@ -142,9 +145,10 @@ on_value_entry_change (GtkEntry *entry, gpointer data)
   const gchar *text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
 
   union value v;
-  text_to_value (text, &v,
-		 dialog->var_store->dict,
-		*var_get_write_format (dialog->pv));
+  text_to_value (text,
+		 dialog->dict,
+		 dialog->pv,
+		 &v);
 
 
   g_signal_handler_block (GTK_ENTRY (dialog->label_entry),
@@ -168,6 +172,8 @@ on_value_entry_change (GtkEntry *entry, gpointer data)
 
   g_signal_handler_unblock (GTK_ENTRY (dialog->label_entry),
 			 dialog->change_handler_id);
+
+  value_destroy (&v, var_get_width (dialog->pv));
 }
 
 
@@ -267,9 +273,10 @@ on_change (GtkWidget *w, gpointer data)
 
   union value v;
 
-  text_to_value (val_text, &v,
-		 dialog->var_store->dict,
-		*var_get_write_format (dialog->pv));
+  text_to_value (val_text,
+		 dialog->dict,
+		 dialog->pv,
+		 &v);
 
   val_labs_replace (dialog->labs, &v,
 		    gtk_entry_get_text (GTK_ENTRY (dialog->label_entry)));
@@ -278,6 +285,8 @@ on_change (GtkWidget *w, gpointer data)
 
   repopulate_dialog (dialog);
   gtk_widget_grab_focus (dialog->value_entry);
+
+  value_destroy (&v, var_get_width (dialog->pv));
 }
 
 /* Callback which occurs when the "Add" button is clicked */
@@ -290,20 +299,22 @@ on_add (GtkWidget *w, gpointer data)
 
   const gchar *text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
 
-  text_to_value (text, &v,
-		 dialog->var_store->dict,
-		*var_get_write_format (dialog->pv));
-
+  text_to_value (text,
+		 dialog->dict,
+		 dialog->pv,
+		 &v);
 
-  if ( ! val_labs_add (dialog->labs, &v,
-		       gtk_entry_get_text
-		       ( GTK_ENTRY (dialog->label_entry)) ) )
-    return ;
+  if (val_labs_add (dialog->labs, &v,
+		    gtk_entry_get_text
+		    ( GTK_ENTRY (dialog->label_entry)) ) )
+    {
+      gtk_widget_set_sensitive (dialog->add_button, FALSE);
 
-  gtk_widget_set_sensitive (dialog->add_button, FALSE);
+      repopulate_dialog (dialog);
+      gtk_widget_grab_focus (dialog->value_entry);
+    }
 
-  repopulate_dialog (dialog);
-  gtk_widget_grab_focus (dialog->value_entry);
+  value_destroy (&v, var_get_width (dialog->pv));
 }
 
 /* Callback which occurs when the "Remove" button is clicked */
@@ -341,7 +352,7 @@ on_select_row (GtkTreeView *treeview, gpointer data)
   gchar *text;
 
   get_selected_tuple (dialog, &value, &label);
-  text = value_to_text (value, dialog->var_store->dict, *var_get_write_format (dialog->pv));
+  text = value_to_text (value, dialog->dict, *var_get_write_format (dialog->pv));
 
   g_signal_handler_block (GTK_ENTRY (dialog->value_entry),
 			 dialog->value_handler_id);
@@ -381,6 +392,7 @@ val_labs_dialog_create (GtkWindow *toplevel, PsppireVarStore *var_store)
   struct val_labs_dialog *dialog = g_malloc (sizeof (*dialog));
 
   dialog->var_store = var_store;
+  g_object_get (var_store, "dictionary", &dialog->dict, NULL);
   dialog->window = get_widget_assert (xml,"val_labs_dialog");
   dialog->value_entry = get_widget_assert (xml,"value_entry");
   dialog->label_entry = get_widget_assert (xml,"label_entry");
@@ -493,7 +505,7 @@ repopulate_dialog (struct val_labs_dialog *dialog)
       const struct val_lab *vl = labels[i];
 
       gchar *const vstr  =
-	value_to_text (vl->value, dialog->var_store->dict,
+	value_to_text (vl->value, dialog->dict,
 		      *var_get_write_format (dialog->pv));
 
       gchar *const text = g_strdup_printf ("%s = \"%s\"",