From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 30 Sep 2012 18:25:23 +0000 (-0700)
Subject: Merge 'master' into 'psppsheet'.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e943de7a3e0645852c3b659889ff3ccf38dd43ec;p=pspp

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

e943de7a3e0645852c3b659889ff3ccf38dd43ec
diff --cc src/ui/gui/split-file-dialog.c
index 82ef631545,e57075e2c6..2cf10d5329
--- a/src/ui/gui/split-file-dialog.c
+++ b/src/ui/gui/split-file-dialog.c
@@@ -177,9 -181,11 +177,9 @@@ split_file_dialog (PsppireDataWindow *d
  
    sfd.tv = GTK_TREE_VIEW (get_widget_assert (sfd.xml, "split-file-grouping-vars"));
  
 -  g_object_get (de->data_editor, "var-store", &vs, NULL);
 -
 -  g_object_get (vs, "dictionary", &sfd.dict, NULL);
 +  g_object_get (de->data_editor, "dictionary", &sfd.dict, NULL);
  
-   sfd.selector = PSPPIRE_SELECTOR (get_widget_assert (sfd.xml, "split-file-selector"));
+   sfd.selector = PSPPIRE_SELECTOR (selector);
  
    g_object_set (source, "model", sfd.dict, NULL);