From: Ben Pfaff <blp@cs.stanford.edu>
Date: Mon, 12 Nov 2012 16:57:34 +0000 (-0800)
Subject: Merge 'master' into 'psppsheet'.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6493cbb201307a2a5d1ff840a8347d75548cb85;p=pspp

Merge 'master' into 'psppsheet'.
---

b6493cbb201307a2a5d1ff840a8347d75548cb85
diff --cc src/ui/gui/compute-dialog.c
index 9ddb66d48e,30456a3818..46f9fbe078
--- a/src/ui/gui/compute-dialog.c
+++ b/src/ui/gui/compute-dialog.c
@@@ -385,8 -405,12 +403,11 @@@ compute_dialog (PsppireDataWindow *de
    GtkWidget *expression =
  	get_widget_assert (xml, "radio-button-expression-label");
  
+   GtkWidget *str_btn =
+ 	get_widget_assert (xml, "radio-button-string");
+ 
  
 -  g_object_get (de->data_editor, "var-store", &vs, NULL);
 -  g_object_get (vs, "dictionary", &scd.dict, NULL);
 +  g_object_get (de->data_editor, "dictionary", &scd.dict, NULL);
    scd.use_type = FALSE;
  
    g_signal_connect (expression, "toggled",