summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-15 17:10:24 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-15 17:10:24 -0400
commit83ca53d9cb5b59427aa8577535cc4cfcac8a2dc3 (patch)
tree755fede5873a55090a2cb722804cc8b971fdce11 /Assistant
parent22b568b78e1e2ba24bfab023a212a1fb7280e09f (diff)
squash warning in OSX build
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Install.hs2
-rw-r--r--Assistant/Install/Menu.hs4
2 files changed, 3 insertions, 3 deletions
diff --git a/Assistant/Install.hs b/Assistant/Install.hs
index dee1b5be3..bb8053ffa 100644
--- a/Assistant/Install.hs
+++ b/Assistant/Install.hs
@@ -11,7 +11,6 @@ module Assistant.Install where
import Assistant.Common
import Assistant.Install.AutoStart
-import Assistant.Install.Menu
import Assistant.Ssh
import Config.Files
import Utility.FileMode
@@ -23,6 +22,7 @@ import Utility.Env
import Utility.OSX
#else
import Utility.FreeDesktop
+import Assistant.Install.Menu
#endif
standaloneAppBase :: IO (Maybe FilePath)
diff --git a/Assistant/Install/Menu.hs b/Assistant/Install/Menu.hs
index 41ec855b6..22ca1da9c 100644
--- a/Assistant/Install/Menu.hs
+++ b/Assistant/Install/Menu.hs
@@ -14,10 +14,10 @@ import Common
import Utility.FreeDesktop
installMenu :: FilePath -> FilePath -> FilePath -> FilePath -> IO ()
-installMenu command menufile iconsrcdir icondir = do
#ifdef darwin_HOST_OS
- return ()
+installMenu _command _menufile _iconsrcdir _icondir = return ()
#else
+installMenu command menufile iconsrcdir icondir = do
writeDesktopMenuFile (fdoDesktopMenu command) menufile
installIcon (iconsrcdir </> "logo.svg") $
iconFilePath (iconBaseName ++ ".svg") "scalable" icondir