update callers of safeSpawn

Ignore-this: 484eca17b9877f7d587fc5bce8c5ae8a

darcs-hash:20090622201423-f7719-e2e02429f80ee2ef794680ebbffda67f1847835c.gz

3 files changed, 4 insertions, 4 deletions

diff --git a/XMonad/Actions/Search.hs b/XMonad/Actions/Search.hs
index 7a1afe3..257cd27 100644
--- a/XMonad/Actions/Search.hs
+++ b/XMonad/Actions/Search.hs
@@ -231,7 +231,7 @@ use (SearchEngine _ engine) = engine
 -- | Given a browser, a search engine's transformation function, and a search term, perform the
 --   requested search in the browser.
 search :: Browser -> Site -> Query -> X ()
-search browser site query = safeSpawn browser $ site query
+search browser site query = safeSpawn browser [site query]
 
 {- | Given a base URL, create the 'SearchEngine' that escapes the query and
    appends it to the base. You can easily define a new engine locally using
diff --git a/XMonad/Prompt/Shell.hs b/XMonad/Prompt/Shell.hs
index 4dc466a..782cb56 100644
--- a/XMonad/Prompt/Shell.hs
+++ b/XMonad/Prompt/Shell.hs
@@ -77,7 +77,7 @@ shellPrompt c = do
 prompt, unsafePrompt, safePrompt :: FilePath -> XPConfig -> X ()
 prompt = unsafePrompt
 safePrompt c config = mkXPrompt Shell config (getShellCompl [c]) run
-    where run = safeSpawn c . encodeOutput
+    where run = safeSpawn c . return . encodeOutput
 unsafePrompt c config = mkXPrompt Shell config (getShellCompl [c]) run
     where run a = unsafeSpawn $ c ++ " " ++ encodeOutput a
 
diff --git a/XMonad/Util/XSelection.hs b/XMonad/Util/XSelection.hs
index 14cfcac..c08e092 100644
--- a/XMonad/Util/XSelection.hs
+++ b/XMonad/Util/XSelection.hs
@@ -129,12 +129,12 @@ shell using 'safeSpawn' from "XMonad.Util.Run"; see its documentation for more
 details on the advantages and disadvantages of using safeSpawn. -}
 promptSelection, safePromptSelection, unsafePromptSelection :: String -> X ()
 promptSelection = unsafePromptSelection
-safePromptSelection app = join $ io $ liftM (safeSpawn app) getSelection
+safePromptSelection app = join $ io $ liftM (safeSpawn app . return) getSelection
 unsafePromptSelection app = join $ io $ liftM unsafeSpawn $ fmap (\x -> app ++ " " ++ x) getSelection
 
 {- | A wrapper around 'promptSelection' and its safe variant. They take two parameters, the first is a function that transforms strings, and the second is the application to run. The transformer essentially transforms the selection in X.
 One example is to wrap code, such as a command line action copied out of the browser to be run as '"sudo" ++ cmd' or '"su - -c \"" ++ cmd ++ "\"".
 -}
 transformPromptSelection, transformSafePromptSelection :: (String -> String) -> String -> X ()
-transformPromptSelection f app = join $ io $ liftM (safeSpawn app) (fmap f getSelection)
+transformPromptSelection f app = join $ io $ liftM (safeSpawn app . return) (fmap f getSelection)
 transformSafePromptSelection f app = join $ io $ liftM unsafeSpawn $ fmap (\x -> app ++ " " ++ x) (fmap f getSelection)