[Fencommits] fenfire-hs: fix a compiler warning, try icon16 instead of logo48

Tuukka Hastrup Tuukka.Hastrup at iki.fi
Thu Feb 22 13:13:53 EET 2007


Thu Feb 22 13:12:57 EET 2007  Tuukka Hastrup <Tuukka.Hastrup at iki.fi>
  * fix a compiler warning, try icon16 instead of logo48
Binary files old-fenfire-hs-1/data/icon16.png and new-fenfire-hs-1/data/icon16.png differ
Binary files old-fenfire-hs-1/data/logo48.png and new-fenfire-hs-1/data/logo48.png differ
diff -rN -u old-fenfire-hs-1/fenfire.cabal new-fenfire-hs-1/fenfire.cabal
--- old-fenfire-hs-1/fenfire.cabal	2007-02-22 13:13:52.000000000 +0200
+++ new-fenfire-hs-1/fenfire.cabal	2007-02-22 13:13:52.000000000 +0200
@@ -12,7 +12,7 @@
 Stability:      alpha
 Homepage:       http://fenfire.org/
 Build-Depends:  base, HaXml, gtk, mtl, unix, cairo, harp, template-haskell, glib
-Data-Files:     data/logo.svg data/logo48.png
+Data-Files:     data/logo.svg data/icon16.png
 
 Executable:     fenfire
 Main-Is:        Fenfire.hs
diff -rN -u old-fenfire-hs-1/Fenfire.fhs new-fenfire-hs-1/Fenfire.fhs
--- old-fenfire-hs-1/Fenfire.fhs	2007-02-22 13:13:52.000000000 +0200
+++ new-fenfire-hs-1/Fenfire.fhs	2007-02-22 13:13:52.000000000 +0200
@@ -622,8 +622,8 @@
             , ( "undo"   , Nothing, stockUndo          , Just "<Ctl>Z"        )
             , ( "redo"   , Nothing, stockRedo          , Just "<Ctl><Shift>Z" )
             ]
-    forM actionentries $ \(name,label,stock,accel) -> do 
-        action <- actionNew name label Nothing (Just stock)
+    forM actionentries $ \(name,label',stock,accel) -> do 
+        action <- actionNew name label' Nothing (Just stock)
         actionGroupAddActionWithAccel actionGroup action accel
         actionSetAccelGroup action accelGroup
 
@@ -787,7 +787,7 @@
     -- main window:
 
     let ?pw = window in mdo
-    logo <- getDataFileName "data/logo48.png"
+    logo <- getDataFileName "data/icon16.png"
     Control.Exception.catch (windowSetIconFromFile window logo)
           (\e -> putStr ("Opening "++logo++" failed: ") >> print e)
     windowSetTitle window "Fenfire"




More information about the Fencommits mailing list