From f98a6a7987ba18e15839e305a72da78e30057619 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Sun, 13 Nov 2011 16:31:52 -0800
Subject: [PATCH] webbrowser: changing open-url to use open-file everywhere.

---
 extra/webbrowser/linux/linux.factor     | 12 ++++--------
 extra/webbrowser/macosx/macosx.factor   | 10 ++--------
 extra/webbrowser/webbrowser.factor      |  7 ++++---
 extra/webbrowser/windows/windows.factor |  6 +-----
 4 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/extra/webbrowser/linux/linux.factor b/extra/webbrowser/linux/linux.factor
index 5a9a8ae386..5eea147b8a 100644
--- a/extra/webbrowser/linux/linux.factor
+++ b/extra/webbrowser/linux/linux.factor
@@ -1,13 +1,9 @@
 ! Copyright (C) 2011 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
-USING: formatting io.launcher present system urls webbrowser ;
+USING: io.launcher kernel sequences system webbrowser ;
 
-IN: webbrowser.unix
-
-M: unix open-file ( path -- )
-    "gnome-open \"%s\"" sprintf try-process ;
-
-M: unix open-url ( url -- )
-    >url present open-file ;
+IN: webbrowser.linux
 
+M: linux open-file ( path -- )
+    { "gnome-open" } swap suffix try-process ;
diff --git a/extra/webbrowser/macosx/macosx.factor b/extra/webbrowser/macosx/macosx.factor
index a510c7c764..18157df881 100644
--- a/extra/webbrowser/macosx/macosx.factor
+++ b/extra/webbrowser/macosx/macosx.factor
@@ -1,15 +1,9 @@
 ! Copyright (C) 2011 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
-USING: formatting io.encodings.ascii io.launcher present system
-urls webbrowser ;
+USING: io.launcher kernel sequences system webbrowser ;
 
 IN: webbrowser.macosx
 
 M: macosx open-file ( path -- )
-    "open \"%s\"" sprintf try-process ;
-
-M: macosx open-url ( url -- )
-    >url present "osascript" ascii [
-        "open location \"%s\"" printf
-    ] with-process-writer ;
+    { "open" } swap suffix try-process ;
diff --git a/extra/webbrowser/webbrowser.factor b/extra/webbrowser/webbrowser.factor
index 33160ca782..ba586e4fe8 100644
--- a/extra/webbrowser/webbrowser.factor
+++ b/extra/webbrowser/webbrowser.factor
@@ -1,18 +1,19 @@
 ! Copyright (C) 2011 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
-USING: combinators system ui.operations urls vocabs ;
+USING: combinators present system ui.operations urls vocabs ;
 
 IN: webbrowser
 
 HOOK: open-file os ( path -- )
 
-HOOK: open-url os ( url -- )
-
 {
     { [ os macosx?  ] [ "webbrowser.macosx"  ] }
     { [ os linux?   ] [ "webbrowser.linux"   ] }
     { [ os windows? ] [ "webbrowser.windows" ] }
 } cond require
 
+: open-url ( url -- )
+    >url present open-file ;
+
 [ url? ] \ open-url H{ } define-operation
diff --git a/extra/webbrowser/windows/windows.factor b/extra/webbrowser/windows/windows.factor
index f7cdd481db..47f06c9db1 100644
--- a/extra/webbrowser/windows/windows.factor
+++ b/extra/webbrowser/windows/windows.factor
@@ -1,13 +1,9 @@
 ! Copyright (C) 2011 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
-USING: present urls webbrowser windows.shell32 windows.user32 ;
+USING: webbrowser windows.shell32 windows.user32 ;
 
 IN: webbrowser.windows
 
 M: windows open-file ( path -- )
     [ f "open" ] dip f f SW_SHOWNORMAL ShellExecute drop ;
-
-M: windows open-url ( url -- )
-    >url present open-file ;
-