projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert psppire.glade to psppire.ui
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire.c
diff --git
a/src/ui/gui/psppire.c
b/src/ui/gui/psppire.c
index b1551fbb15f137f81cc548cc48f3f49a80f70fb3..02415d68bc3df8a6250d0a115f622c52de6c787f 100644
(file)
--- a/
src/ui/gui/psppire.c
+++ b/
src/ui/gui/psppire.c
@@
-72,9
+72,7
@@
struct dataset * the_dataset = NULL;
static void
replace_casereader (struct casereader *s)
{
static void
replace_casereader (struct casereader *s)
{
- PsppireCaseFile *pcf = psppire_case_file_new (s);
-
- psppire_data_store_set_case_file (the_data_store, pcf);
+ psppire_data_store_set_reader (the_data_store, s);
}
#define _(msgid) gettext (msgid)
}
#define _(msgid) gettext (msgid)
@@
-263,7
+261,13
@@
parse_non_options (int key, char *arg, struct argp_state *state)
if (pfm_detect (fp))
{
ds_init_cstr (&syntax, "IMPORT FILE=");
if (pfm_detect (fp))
{
ds_init_cstr (&syntax, "IMPORT FILE=");
+ goto close;
}
}
+
+ fclose (fp);
+ msg (ME, _("%s is neither a system nor portable file"), arg);
+ break;
+
close:
fclose (fp);
close:
fclose (fp);