Fix GPS settings dialog so it works.

[mapper] / src / file.c

diff --git a/src/file.c b/src/file.c
index 7c3cab6e53c7cbd3f2cf2a322df424982a091ea7..68bf5b8f9c747501d7c48a208ca9ac37aee57e33 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -23,14 +23,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
-
 #include <config.h>
 #include <gtk/gtk.h>
 #include <libgnomevfs/gnome-vfs.h>
 
 #include "hildon-mapper.h"
 
+#include "path.h"
 #include "utils.h"
 #include "mapper-types.h"
 #include "settings.h"
@@ -108,10 +107,12 @@ if (dir && *dir) {
        gtk_file_chooser_set_current_folder_uri(GTK_FILE_CHOOSER(dialog), g_get_home_dir());
 }
 
-if (file && *file)
+if (file && *file) {
        gtk_file_chooser_set_uri(GTK_FILE_CHOOSER(dialog), *file);
-else
-       gtk_file_chooser_set_uri(GTK_FILE_CHOOSER(dialog), "track.gpx");
+       if (strlen(*file)==0)
+               gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), "track.gpx");
+} else
+       gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), "track.gpx");
 
 if (gtk_dialog_run(GTK_DIALOG(dialog))==GTK_RESPONSE_OK) {
        gchar *file_uri_str;
@@ -148,7 +149,7 @@ GnomeVFSResult vfs_result;
 
 if (!file_open(dir, &file_uri_str)) {
        buffer=NULL;
-       return TRUE;
+       return FALSE;
 }
 
 vfs_result=gnome_vfs_read_entire_file(file_uri_str, bytes, buffer);