projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "master" into "psppsheet" to obtain bug fixes from "master".
[pspp]
/
src
/
ui
/
gui
/
find-dialog.c
diff --git
a/src/ui/gui/find-dialog.c
b/src/ui/gui/find-dialog.c
index 1f929b6485f88e5071d79bddb54e8b5c5044f7a8..1bdf35e422cd86811168a7a26d03aad439d13d71 100644
(file)
--- a/
src/ui/gui/find-dialog.c
+++ b/
src/ui/gui/find-dialog.c
@@
-49,9
+49,6
@@
which match particular strings */
#define N_(msgid) msgid
#define N_(msgid) msgid
-/* FIXME: These shouldn't be here */
-#include "psppire-var-store.h"
-
struct find_dialog
{
GtkBuilder *xml;
struct find_dialog
{
GtkBuilder *xml;
@@
-196,7
+193,6
@@
find_dialog (PsppireDataWindow *de)
GtkWidget *buttonbox;
GtkWidget *buttonbox;
- PsppireVarStore *vs ;
PsppireDataStore *ds ;
fd.xml = builder_new ("find.ui");
PsppireDataStore *ds ;
fd.xml = builder_new ("find.ui");
@@
-215,12
+211,10
@@
find_dialog (PsppireDataWindow *de)
selector = get_widget_assert (fd.xml, "find-selector");
g_object_get (de->data_editor,
selector = get_widget_assert (fd.xml, "find-selector");
g_object_get (de->data_editor,
- "
var-store", &vs
,
+ "
dictionary", &fd.dict
,
"data-store", &ds,
NULL);
"data-store", &ds,
NULL);
- g_object_get (vs, "dictionary", &fd.dict, NULL);
-
fd.data = ds->datasheet;
fd.variable_entry = get_widget_assert (fd.xml, "find-variable-entry");
fd.data = ds->datasheet;
fd.variable_entry = get_widget_assert (fd.xml, "find-variable-entry");