Only generate NUMERIC or STRING command if the type-and-label dialog was

used.

diff --git a/src/ui/gui/ChangeLog b/src/ui/gui/ChangeLog
index 098878a661a2cfa060d9434681b441b75d4fb224..093ae2f971cecb8a191f852e9f5804f27885a086 100644 (file)
--- a/src/ui/gui/ChangeLog
+++ b/src/ui/gui/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-15  John Darrington <john@darrington.wattle.id.au>
+
+       * compute-dialog.c: Only generate NUMERIC/STRING command if the 
+       type-and-label dialog was used.
+
 2007-07-12  John Darrington <john@darrington.wattle.id.au>
 
        * psppire-data-store.c: Added call to g_sheet_model_range_changed to 

diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c
index a74cc8dd601de843c9625dc08d6b810075550376..739d6b17cc504862631abed82986149452a5d141 100644 (file)
--- a/src/ui/gui/compute-dialog.c
+++ b/src/ui/gui/compute-dialog.c
@@ -48,6 +48,7 @@ struct compute_dialog
 {
   GladeXML *xml;  /* The xml that generated the widgets */
   PsppireDict *dict;
+  gboolean use_type;
 };
 
 
@@ -77,18 +78,15 @@ refresh (GObject *obj, const struct compute_dialog *cd)
 
   GtkTreeSelection *selection;
 
-
   /* Clear the target variable entry box */
   gtk_entry_set_text (GTK_ENTRY (target), "");
   g_signal_emit_by_name (target, "changed");
 
-
   /* Clear the syntax area textbuffer */
   gtk_text_buffer_get_start_iter (buffer, &start);
   gtk_text_buffer_get_end_iter (buffer, &end);
   gtk_text_buffer_delete (buffer, &start, &end);
 
-
   /* Unselect all items in the treeview */
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (varlist));
   gtk_tree_selection_unselect_all (selection);
@@ -178,7 +176,8 @@ generate_syntax (const struct compute_dialog *cd)
 
   string = g_string_sized_new (64);
 
-  if ( NULL == psppire_dict_lookup_var (cd->dict, target_name ))
+  if ( cd-> use_type && 
+       NULL == psppire_dict_lookup_var (cd->dict, target_name ))
     {
       if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (string_toggle)))
        {
@@ -293,6 +292,8 @@ run_type_label_dialog (GtkButton *b, gpointer data)
 
   reset_type_label_dialog (cd);
   response = psppire_dialog_run (PSPPIRE_DIALOG (subdialog));
+  if ( response == PSPPIRE_RESPONSE_CONTINUE)
+    cd->use_type = TRUE;
 }
 
 
@@ -359,6 +360,7 @@ compute_dialog (GObject *o, gpointer data)
   vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
 
   scd.dict = vs->dict;
+  scd.use_type = FALSE;
 
   g_signal_connect (expression, "toggled",
                    G_CALLBACK(on_expression_toggle), &scd);