Separate the execute_syntax function into its own file.

[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 52ec0d49b25db95eedcdff6f2924e9b7196e75dd..c53e2fe07d17a410989de00085f8617fb7790ed3 100644 (file)
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -18,6 +18,7 @@
 
 #include <gtk/gtksignal.h>
 #include <gtk/gtkbox.h>
+#include "executor.h"
 #include "helper.h"
 
 #include "text-data-import-dialog.h"
@@ -404,7 +405,17 @@ sysfile_chooser_dialog (PsppireWindow *toplevel)
     gchar *filename = NULL;
     g_object_get (toplevel, "filename", &filename, NULL);
 
-    dir_name = g_path_get_dirname (filename);
+    if ( ! g_path_is_absolute (filename))
+      {
+       gchar *path =
+         g_build_filename (g_get_current_dir (), filename, NULL);
+       dir_name = g_path_get_dirname (path);
+       g_free (path);
+      }
+    else
+      {
+       dir_name = g_path_get_dirname (filename);
+      }
     gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
                                         dir_name);
     free (dir_name);