projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: Always convert file names to UTF-8 for use in syntax.
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire-data-window.c
diff --git
a/src/ui/gui/psppire-data-window.c
b/src/ui/gui/psppire-data-window.c
index 9a3470ae4df8e90fea20069019d638ae3d95b39c..72f8abbb65788a283160ace6a22ea0e1cbffe896 100644
(file)
--- a/
src/ui/gui/psppire-data-window.c
+++ b/
src/ui/gui/psppire-data-window.c
@@
-351,19
+351,18
@@
dump_rm (GtkRecentManager *rm)
static gboolean
load_file (PsppireWindow *de, const gchar *file_name)
{
static gboolean
load_file (PsppireWindow *de, const gchar *file_name)
{
- gchar *
native
_file_name;
+ gchar *
utf8
_file_name;
struct string filename;
gchar *syntax;
bool ok;
ds_init_empty (&filename);
struct string filename;
gchar *syntax;
bool ok;
ds_init_empty (&filename);
- native_file_name =
- convert_glib_filename_to_system_filename (file_name, NULL);
+ utf8_file_name = g_filename_to_utf8 (file_name, -1, NULL, NULL, NULL);
- syntax_gen_string (&filename, ss_cstr (
native
_file_name));
+ syntax_gen_string (&filename, ss_cstr (
utf8
_file_name));
- g_free (
native
_file_name);
+ g_free (
utf8
_file_name);
syntax = g_strdup_printf ("GET FILE=%s.", ds_cstr (&filename));
ds_destroy (&filename);
syntax = g_strdup_printf ("GET FILE=%s.", ds_cstr (&filename));
ds_destroy (&filename);
@@
-496,7
+495,7
@@
name_has_suffix (const gchar *name)
static void
save_file (PsppireWindow *w)
{
static void
save_file (PsppireWindow *w)
{
- gchar *
native
_file_name = NULL;
+ gchar *
utf8
_file_name = NULL;
gchar *file_name = NULL;
GString *fnx;
struct string filename ;
gchar *file_name = NULL;
GString *fnx;
struct string filename ;
@@
-517,13
+516,12
@@
save_file (PsppireWindow *w)
ds_init_empty (&filename);
ds_init_empty (&filename);
- native_file_name =
- convert_glib_filename_to_system_filename (fnx->str, NULL);
+ utf8_file_name = g_filename_to_utf8 (fnx->str, -1, NULL, NULL, NULL);
g_string_free (fnx, TRUE);
g_string_free (fnx, TRUE);
- syntax_gen_string (&filename, ss_cstr (
native
_file_name));
- g_free (
native
_file_name);
+ syntax_gen_string (&filename, ss_cstr (
utf8
_file_name));
+ g_free (
utf8
_file_name);
syntax = g_strdup_printf ("%s OUTFILE=%s.",
de->save_as_portable ? "EXPORT" : "SAVE",
syntax = g_strdup_printf ("%s OUTFILE=%s.",
de->save_as_portable ? "EXPORT" : "SAVE",
@@
-565,16
+563,16
@@
sysfile_info (PsppireDataWindow *de)
gchar *file_name =
gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
gchar *file_name =
gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
- gchar *
native_file_name =
-
convert_glib_filename_to_system_filename (file_name,
NULL);
+ gchar *
utf8_file_name = g_filename_to_utf8 (file_name, -1, NULL, NULL,
+
NULL);
gchar *syntax;
ds_init_empty (&filename);
gchar *syntax;
ds_init_empty (&filename);
- syntax_gen_string (&filename, ss_cstr (
native
_file_name));
+ syntax_gen_string (&filename, ss_cstr (
utf8
_file_name));
- g_free (
native
_file_name);
+ g_free (
utf8
_file_name);
syntax = g_strdup_printf ("SYSFILE INFO %s.", ds_cstr (&filename));
g_free (execute_syntax_string (syntax));
syntax = g_strdup_printf ("SYSFILE INFO %s.", ds_cstr (&filename));
g_free (execute_syntax_string (syntax));