[Fencommits] fenfire-hs: fix warnings

[Tuukka Hastrup]

Mon Oct  5 22:53:08 EEST 2009  Tuukka Hastrup <Tuukka.Hastrup at iki.fi>
  * fix warnings
  Ignore-this: d3409ce6844b875a4b954cef6e327aef

    M ./Fenfire/Darcs2RDF.fhs -1 +2
    M ./Fenfire/Main.hs -1 +2
    M ./Fenfire/VobTest.fhs -1 +1
    M ./Fenfire/Vobs.fhs -2 +3
    M ./Setup.hs -1 +1

Mon Oct  5 22:53:08 EEST 2009  Tuukka Hastrup <Tuukka.Hastrup at iki.fi>
  * fix warnings
  Ignore-this: d3409ce6844b875a4b954cef6e327aef
diff -rN -u old-fenfire-hs/Fenfire/Darcs2RDF.fhs new-fenfire-hs/Fenfire/Darcs2RDF.fhs
--- old-fenfire-hs/Fenfire/Darcs2RDF.fhs	2009-10-05 22:54:10.578170048 +0300
+++ new-fenfire-hs/Fenfire/Darcs2RDF.fhs	2009-10-05 22:54:10.578170048 +0300
@@ -1,5 +1,6 @@
 -- HaRP pattern translator produces following warnings:
-{-# OPTIONS_GHC -fno-warn-name-shadowing -fno-warn-incomplete-patterns #-}
+{-# OPTIONS_GHC -fno-warn-name-shadowing -fno-warn-incomplete-patterns
+                -fno-warn-unused-binds #-}
 module Fenfire.Darcs2RDF where
 
 -- Copyright (c) 2006-2007, Benja Fallenstein, Tuukka Hastrup
diff -rN -u old-fenfire-hs/Fenfire/Main.hs new-fenfire-hs/Fenfire/Main.hs
--- old-fenfire-hs/Fenfire/Main.hs	2009-10-05 22:54:10.578170048 +0300
+++ new-fenfire-hs/Fenfire/Main.hs	2009-10-05 22:54:10.578170048 +0300
@@ -41,7 +41,8 @@
 import qualified Data.Map as Map
 
 import Fenfire.GtkFixes
-import Graphics.UI.Gtk hiding (Color, get, disconnect, fill,
+import Graphics.UI.Gtk hiding (Color, get, disconnect, fill, stateChanged,
+                               focus,
 -- GtkFixes overrides:
                                actionNew,
                                widgetGetStyle,
diff -rN -u old-fenfire-hs/Fenfire/Vobs.fhs new-fenfire-hs/Fenfire/Vobs.fhs
--- old-fenfire-hs/Fenfire/Vobs.fhs	2009-10-05 22:54:10.578170048 +0300
+++ new-fenfire-hs/Fenfire/Vobs.fhs	2009-10-05 22:54:10.578170048 +0300
@@ -35,7 +35,8 @@
 import Control.Monad.Reader
 import Control.Monad.Trans (liftIO, MonadIO)
 
-import Graphics.UI.Gtk hiding (Point, Size, Layout, Color, get, fill)
+import Graphics.UI.Gtk hiding (Point, Size, Layout, Color, get, fill,
+                               stateChanged)
 import Graphics.UI.Gtk.Gdk.Events (Event(..))
 import qualified Graphics.Rendering.Cairo as C
 import Graphics.Rendering.Cairo.Matrix (Matrix(Matrix))
@@ -381,7 +382,7 @@
                 rcFgColor=black, rcBgColor=white, rcFadeColor=bgColor }
                    
         updateAnim interpolate' = mdo
-	    (vob,scene,_) <- readIORef animRef
+	    (_vob,scene,_) <- readIORef animRef
             vob' <- getVob
 
             rc' <- getRenderContext scene'
diff -rN -u old-fenfire-hs/Fenfire/VobTest.fhs new-fenfire-hs/Fenfire/VobTest.fhs
--- old-fenfire-hs/Fenfire/VobTest.fhs	2009-10-05 22:54:10.578170048 +0300
+++ new-fenfire-hs/Fenfire/VobTest.fhs	2009-10-05 22:54:10.578170048 +0300
@@ -31,7 +31,7 @@
 import Graphics.UI.Gtk hiding (Point, Size, Layout, Color, get, fill)
 import System.Environment (getArgs)
 
-import Control.Exception hiding (Handler)
+import Control.Exception hiding (Handler, handle)
 
 type Info = (String, Double, Double)
 type Data = [(String,[Info])]
diff -rN -u old-fenfire-hs/Setup.hs new-fenfire-hs/Setup.hs
--- old-fenfire-hs/Setup.hs	2009-10-05 22:54:10.578170048 +0300
+++ new-fenfire-hs/Setup.hs	2009-10-05 22:54:10.578170048 +0300
@@ -8,7 +8,7 @@
 import System.Directory (getModificationTime, doesFileExist)
 
 main = defaultMainWithHooks hooks
-hooks = defaultUserHooks { hookedPreProcessors = [trhsx] }
+hooks = simpleUserHooks { hookedPreProcessors = [trhsx] }
 
 trhsx :: PPSuffixHandler
 trhsx = ("fhs", f) where