X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.c;h=3cecdd71e7baa614af5a42596bb42e572e3d51bf;hb=e6ae2a61e5356694c09f48da74407f8054a04e8d;hp=fd5e491f1676294879bdf1047ac23761ff0b281b;hpb=bea461dcf5d18e97e76facc5b1faf9ca86be7646;p=pspp-builds.git diff --git a/src/ui/gui/data-editor.c b/src/ui/gui/data-editor.c index fd5e491f..3cecdd71 100644 --- a/src/ui/gui/data-editor.c +++ b/src/ui/gui/data-editor.c @@ -41,6 +41,7 @@ #include "data-editor.h" #include "syntax-editor.h" #include +#include #include "window-manager.h" #include "psppire-data-store.h" @@ -838,22 +839,28 @@ static void save_file (struct data_editor *de) { struct getl_interface *sss; + struct string file_name ; g_assert (de->file_name); + ds_init_cstr (&file_name, de->file_name); + gen_quoted_string (&file_name); + if ( de->save_as_portable ) { append_filename_suffix (de, ".por"); - sss = create_syntax_string_source ("EXPORT OUTFILE='%s'.", - de->file_name); + sss = create_syntax_string_source ("EXPORT OUTFILE=%s.", + ds_cstr (&file_name)); } else { append_filename_suffix (de, ".sav"); - sss = create_syntax_string_source ("SAVE OUTFILE='%s'.", - de->file_name); + sss = create_syntax_string_source ("SAVE OUTFILE=%s.", + ds_cstr (&file_name)); } + ds_destroy (&file_name); + execute_syntax (sss); } @@ -1003,13 +1010,20 @@ open_data_dialog (GtkAction *action, struct data_editor *de) case GTK_RESPONSE_ACCEPT: { struct getl_interface *sss; + struct string filename; g_free (de->file_name); de->file_name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - sss = create_syntax_string_source ("GET FILE='%s'.", de->file_name); + ds_init_cstr (&filename, de->file_name); + + gen_quoted_string (&filename); + + sss = create_syntax_string_source ("GET FILE=%s.", + ds_cstr (&filename)); execute_syntax (sss); + ds_destroy (&filename); window_set_name_from_filename (e, de->file_name); }