Improve Fluid argument handling and relative paths. (#545)

Fix typos, fix merge conflict.

1 files changed, 11 insertions, 11 deletions

diff --git a/fluid/Fluid_Image.cxx b/fluid/Fluid_Image.cxx
index f76a88d25..e7fcbc253 100644
--- a/fluid/Fluid_Image.cxx
+++ b/fluid/Fluid_Image.cxx
@@ -104,9 +104,9 @@ void Fluid_Image::write_static() {
     }
     write_c("static const unsigned char %s[] =\n", idata_name);
 
-    goto_designfile_dir();
+    enter_project_dir();
     FILE *f = fl_fopen(name(), "rb");
-    leave_designfile_dir();
+    leave_project_dir();
     if (!f) {
       write_file_error("JPEG");
     } else {
@@ -136,9 +136,9 @@ void Fluid_Image::write_static() {
             (gzipped ? "static const unsigned char %s[] =\n" : "static const char %s[] =\n"),
             idata_name);
 
-    goto_designfile_dir();
+    enter_project_dir();
     FILE *f = fl_fopen(name(), "rb");
-    leave_designfile_dir();
+    leave_project_dir();
     size_t nData = 0;
     if (!f) {
       write_file_error("SVG");
@@ -180,9 +180,9 @@ void Fluid_Image::write_static() {
 
 void Fluid_Image::write_file_error(const char *fmt) {
   write_c("#warning Cannot read %s file \"%s\": %s\n", fmt, name(), strerror(errno));
-  goto_designfile_dir();
+  enter_project_dir();
   write_c("// Searching in path \"%s\"\n", fl_getcwd(0, FL_PATH_MAX));
-  leave_designfile_dir();
+  leave_project_dir();
 }
 
 void Fluid_Image::write_initializer(const char *type_name, const char *format, ...) {
@@ -234,11 +234,11 @@ Fluid_Image* Fluid_Image::find(const char *iname) {
 
   // no, so now see if the file exists:
 
-  goto_designfile_dir();
+  enter_project_dir();
   FILE *f = fl_fopen(iname,"rb");
   if (!f) {
     read_error("%s : %s",iname,strerror(errno));
-    leave_designfile_dir();
+    leave_project_dir();
     return 0;
   }
   fclose(f);
@@ -250,7 +250,7 @@ Fluid_Image* Fluid_Image::find(const char *iname) {
     ret = 0;
     read_error("%s : unrecognized image format", iname);
   }
-  leave_designfile_dir();
+  leave_project_dir();
   if (!ret) return 0;
 
   // make a new entry in the table:
@@ -299,7 +299,7 @@ Fluid_Image::~Fluid_Image() {
 
 const char *ui_find_image_name;
 Fluid_Image *ui_find_image(const char *oldname) {
-  goto_designfile_dir();
+  enter_project_dir();
   fl_file_chooser_ok_label("Use Image");
   const char *name = fl_file_chooser("Image?",
             "Image Files (*.{bm,bmp,gif,jpg,pbm,pgm,png,ppm,xbm,xpm,svg"
@@ -311,6 +311,6 @@ Fluid_Image *ui_find_image(const char *oldname) {
   fl_file_chooser_ok_label(NULL);
   ui_find_image_name = name;
   Fluid_Image *ret = (name && *name) ? Fluid_Image::find(name) : 0;
-  leave_designfile_dir();
+  leave_project_dir();
   return ret;
 }