From b6e082668411605b3f06a79572de3b7981dd3430 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Sun, 20 Jul 2008 15:31:57 -0500
Subject: [PATCH] Remove dependence on FLTK >= 1.1.8.

---
 Timeline/TLE.fl   | 29 +++++++++++++++++++----------
 configure         |  2 +-
 doc/OVERVIEW.html |  2 +-
 doc/OVERVIEW.mu   |  2 +-
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/Timeline/TLE.fl b/Timeline/TLE.fl
index a6c331e..05ab5b0 100644
--- a/Timeline/TLE.fl
+++ b/Timeline/TLE.fl
@@ -192,8 +192,7 @@ menubar->add( "&Timeline", 0, 0, const_cast< Fl_Menu_Item *>( timeline->menu->me
 }
 
 
-Loggable::progress_callback( &TLE::progress_cb, this );} {selected
-    }
+Loggable::progress_callback( &TLE::progress_cb, this );} {}
   }
   Function {make_window()} {open
   } {
@@ -783,7 +782,8 @@ Fl::check();} {}
 
 snprintf( pat, 256, "file://%s%s.html", DOCUMENT_PATH, file );
 
-fl_open_uri( pat );} {}
+open_url( pat );} {selected
+    }
   }
 } 
 
@@ -970,7 +970,8 @@ window->do_callback();}
   }
 } 
 
-class About_Dialog {} {
+class About_Dialog {open
+} {
   Function {About_Dialog()} {open
   } {
     code {make_window();} {}
@@ -1047,12 +1048,7 @@ You should have received a copy of the GNU General Public License along with thi
       }
       Fl_Button {} {
         label {http://non-daw.tuxfamily.org}
-        callback {\#if ! ( FL_MAJOR_VERSION >= 1 && FL_MINOR_VERSION >= 1 && FL_PATCH_VERSION >= 8 )
-	// FIXME: got a better idea?
-	system( "x-www-browser http://non-daw.tuxfamily.org &" );
-\#else
-	fl_open_uri( "http://non-daw.tuxfamily.org" );
-\#endif}
+        callback {open_url( o->label() );}
         xywh {125 614 245 30} color 14 labeltype SHADOW_LABEL labelcolor 6
       }
       Fl_Box {} {
@@ -1062,3 +1058,16 @@ You should have received a copy of the GNU General Public License along with thi
     }
   }
 } 
+
+Function {open_url( const char *url )} {open return_type void
+} {
+  code {\#if ! ( FL_MAJOR_VERSION >= 1 && FL_MINOR_VERSION >= 1 && FL_PATCH_VERSION >= 8 )
+	
+	// FIXME: got a better idea?
+	char cmd[256];
+	snprintf( cmd, sizeof( cmd ), "x-www-browser '%s' &", url );
+	system( cmd );
+\#else
+	fl_open_uri( url );
+\#endif} {}
+} 
diff --git a/configure b/configure
index 258f2a4..2605ff8 100755
--- a/configure
+++ b/configure
@@ -15,7 +15,7 @@ ask "Build for debugging" USE_DEBUG no
 
 begin_tests
 
-require_FLTK 1.1.8 images
+require_FLTK 1.1.7 images
 require_command FLUID fluid
 require_package JACK 0.103.0 jack
 require_package sndfile 1.0.17 sndfile
diff --git a/doc/OVERVIEW.html b/doc/OVERVIEW.html
index 150079c..9487191 100644
--- a/doc/OVERVIEW.html
+++ b/doc/OVERVIEW.html
@@ -206,7 +206,7 @@ There are no pre-compiled binaries available.
 <p>
 The following libraries are required to build Non-DAW
 </p>
-<ul><li><span>FLTK >= 1.1.8 (with `fluid`)</span>
+<ul><li><span>FLTK >= 1.1.7 (with `fluid`)</span>
 <li><span>JACK >= 0.103.0</span>
 <li><span>libsndfile >= 0.18.0</span>
 </ul><p>
diff --git a/doc/OVERVIEW.mu b/doc/OVERVIEW.mu
index 69d66df..212a472 100644
--- a/doc/OVERVIEW.mu
+++ b/doc/OVERVIEW.mu
@@ -363,7 +363,7 @@
 
   The following libraries are required to build Non-DAW
 
-* FLTK >= 1.1.8 (with `fluid`)
+* FLTK >= 1.1.7 (with `fluid`)
 * JACK >= 0.103.0
 * libsndfile >= 0.18.0