[dasher] Don't accept a uri from GtkFileChooser as LoadFile will fopen it, and

[Patrick Welche <pwelche src gnome org>]

commit 61edbbc196a46f803f6a508cf6feaa82ea57d891
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Tue May 5 17:21:47 2009 +0100

    Don't accept a uri from GtkFileChooser as LoadFile will fopen it, and
    LoadFile is in common code. Do we actually need gvfs?
---
 ChangeLog                |    5 +++++
 Src/Gtk2/dasher_main.cpp |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7cbd0f3..edc7f5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-05  Patrick Welche  <prlw1 cam ac uk>
+
+	* dasher_main.cpp: Don't accept a uri from GtkFileChooser as
+	LoadFile will fopen it.
+
 2009-05-02  Patrick Welche  <prlw1 cam ac uk>
 
 	* Require glib and gtk 2.6.0 (in maemo and released December 2004),
diff --git a/Src/Gtk2/dasher_main.cpp b/Src/Gtk2/dasher_main.cpp
index aae88ac..dddb935 100644
--- a/Src/Gtk2/dasher_main.cpp
+++ b/Src/Gtk2/dasher_main.cpp
@@ -1050,13 +1050,13 @@ dasher_main_command_import(DasherMain *pSelf) {
 						    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, 
 						    NULL);
 
-#ifdef GNOME_LIBS
+#ifdef TEACH_TRAINING_HELPER_LOAD_FILE_ABOUT_URI
   gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(pFileSel), FALSE);
 #endif
 
   if(gtk_dialog_run(GTK_DIALOG(pFileSel)) == GTK_RESPONSE_ACCEPT) {
 
-#ifdef GNOME_LIBS
+#ifdef TEACH_TRAINING_HELPER_LOAD_FILE_ABOUT_URI
     gchar *szFilename = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(pFileSel));
 #else
     gchar *szFilename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(pFileSel));