apelsin 1.2.2 → 1.2.3
raw patch · 4 files changed
+22/−8 lines, 4 filesdep −cpphs
Dependencies removed: cpphs
Files
- apelsin.cabal +5/−3
- share/applications/apelsin.desktop +10/−0
- src/About.hs +2/−2
- src/Config.hs +5/−3
apelsin.cabal view
@@ -1,7 +1,8 @@ Name: apelsin-Version: 1.2.2+Version: 1.2.3 Author: Christoffer Öjeling Maintainer: christoffer@ojeling.net+Homepage: http://ojeling.net/apelsin License: GPL-3 License-File: LICENSE Category: Network@@ -24,6 +25,7 @@ icons/hicolor/48x48/apps/apelsin.png icons/hicolor/24x24/apps/apelsin.png icons/hicolor/64x64/apps/apelsin.png+ applications/apelsin.desktop Tested-With: GHC==7.6.2 @@ -42,7 +44,7 @@ Build-Depends: base>=4.3&&<5, array, mtl, containers, transformers, bytestring, directory, filepath, HTTP, network, tremulous-query>=1.0.7, gtk, glib, process, deepseq,- cpphs, xdg-basedir+ xdg-basedir Hs-Source-Dirs: src Main-is: Apelsin.hs@@ -74,7 +76,7 @@ Paths_apelsin Ghc-Options: -Wall -threaded -fno-warn-unused-do-bind- -funbox-strict-fields -optP --cpp -pgmP cpphs+ -funbox-strict-fields if !flag(relativePath) cpp-options: -DCABAL_PATH
@@ -0,0 +1,10 @@+[Desktop Entry]+Encoding=UTF-8+Version=1.2+Type=Application+Terminal=false+Categories=Network+Exec=apelsin+Name=Apelsin+Comment=Apelsin Tremulous Browser+Icon=apelsin
src/About.hs view
@@ -14,9 +14,9 @@ , windowTransientFor := win , aboutDialogProgramName:= programName , aboutDialogVersion := showVersion version- , aboutDialogCopyright := "Copyright © 2011-2012\nChristoffer Öjeling <christoffer@ojeling.net>"+ , aboutDialogCopyright := "Copyright © 2011-2013\nChristoffer Öjeling <christoffer@ojeling.net>" , aboutDialogComments := "A tremulous server and community browser\nLicense: GPLv3"- , aboutDialogWebsite := "http://ojeling.net"+ , aboutDialogWebsite := "http://ojeling.net/apelsin" ] dialogRun about widgetDestroy about
src/Config.hs view
@@ -1,4 +1,6 @@ {-# LANGUAGE CPP #-}+{-# OPTIONS_GHC -pgmP cpp #-}+ module Config( Config(..) , ColorTheme@@ -66,7 +68,7 @@ #if defined(mingw32_HOST_OS) || defined(__MINGW32__) , tremulousPath = "C:\\Program Files\\Tremulous\\tremulous.exe" , tremulousGppPath = "C:\\Program Files\\Tremulous\\tremulous-gpp.exe"- , unvanquishedPath = "C:\\Program Files\\Unvanquished\\daemon.exe"+ , unvanquishedPath = "C:\\Program Files (x86)\\Unvanquished\\daemon.exe" #else , tremulousPath = "tremulous" , tremulousGppPath = "tremulous-gpp"@@ -172,8 +174,8 @@ getKV :: Read b => String -> (b -> c) -> c -> State [(String, String)] c getKV key f def = do s <- get- let (e, s') = lookupDelete key s- put s'+ let (e, sNew) = lookupDelete key s+ put sNew return $ SM.maybe def f $ smread =<< e