diff options
Diffstat (limited to 'Utility')
| -rw-r--r-- | Utility/FreeDesktop.hs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Utility/FreeDesktop.hs b/Utility/FreeDesktop.hs index 6338948d2..9ed92a77b 100644 --- a/Utility/FreeDesktop.hs +++ b/Utility/FreeDesktop.hs @@ -93,16 +93,13 @@ autoStartPath :: String -> FilePath -> FilePath autoStartPath basename configdir = configdir </> "autostart" </> desktopfile basename -{- Path to use for an icon file. +{- Path to use for an icon file, in either the systemDataDir + - or the userDatadir. + - - The resolution is something like "48x48" or "scalable". -} -iconFilePath :: FilePath -> String -> Bool -> IO FilePath -iconFilePath file resolution systemwide - | systemwide = return $ systemDataDir </> "icons" </> subpath - | otherwise = do - home <- myHomeDir - return $ home </> ".icons" </> subpath - where - subpath = "hicolor" </> resolution </> "apps" </> file +iconFilePath :: FilePath -> String -> FilePath -> FilePath +iconFilePath file resolution datadir = datadir </> "icons" </> + "hicolor" </> resolution </> "apps" </> file desktopfile :: FilePath -> FilePath desktopfile f = f ++ ".desktop" |