From 0bc4a78db52b80cbc36652cb3ce8b4b3d9c3037a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 15 Dec 2013 17:10:24 -0400 Subject: [PATCH] squash warning in OSX build --- Assistant/Install.hs | 2 +- Assistant/Install/Menu.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assistant/Install.hs b/Assistant/Install.hs index dee1b5be37..bb8053ffa4 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 41ec855b69..22ca1da9c2 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