--- ../../../vacuum-orig/vacuum-cairo-0.4.1/System/Vacuum/Cairo.hs	2010-12-11 17:08:00.000000000 -0600
+++ ./Cairo.hs	2010-12-11 17:02:50.000000000 -0600
@@ -18,7 +18,7 @@
 ,   viewFile -- export to .svg file
  ) where
 
-import qualified Graphics.UI.Gtk as G
+import qualified Graphics.UI.Gtk as Gtk
 import qualified Graphics.UI.Gtk.Gdk.Events as G
 import qualified Graphics.Rendering.Cairo as C
 import qualified Graphics.Rendering.Cairo.SVG as C
@@ -46,8 +46,8 @@
 ------------------------------------------------------------------------
 
 data Session = Session {
-        sWindow  :: !G.Window ,
-        sDrawing :: !G.DrawingArea ,
+        sWindow  :: !Gtk.Window ,
+        sDrawing :: !Gtk.DrawingArea ,
         sSVG     :: !C.SVG
     }
 
@@ -60,33 +60,33 @@
 -- | Create a new vacuum session
 newSession :: IO ()
 newSession = do
-    G.unsafeInitGUIForThreadedRTS
-    window <- G.windowNew
-    canvas <- G.drawingAreaNew
+    Gtk.unsafeInitGUIForThreadedRTS
+    window <- Gtk.windowNew
+    canvas <- Gtk.drawingAreaNew
 
     svg    <- C.svgNewFromString welcome
 
-    G.onKeyPress window $ anyKey (G.widgetDestroy window)
-    G.onDestroy  window (takeMVar sessionRef >> G.mainQuit)
+    Gtk.onKeyPress window $ anyKey (Gtk.widgetDestroy window)
+    Gtk.onDestroy  window (takeMVar sessionRef >> Gtk.mainQuit)
 
-    G.onExposeRect canvas $ const $ do
+    Gtk.onExposeRect canvas $ const $ do
 --        print "EXPOSE"
         withMVar sessionRef $ \(Session _ c svg) ->
              updateCanvas svg c
         return ()
 
     -- not needed.
-    G.onExposeRect window $ const $ do
+    Gtk.onExposeRect window $ const $ do
 --        print "EXPOSE"
         withMVar sessionRef $ \(Session _ c svg) ->
              updateCanvas svg c
         return ()
 
-    G.set window [G.containerChild G.:= canvas]
+    Gtk.set window [Gtk.containerChild Gtk.:= canvas]
 
-    G.windowSetDefaultSize window 400 200
-    G.widgetShowAll window
-    forkIO G.mainGUI
+    Gtk.windowSetDefaultSize window 400 200
+    Gtk.widgetShowAll window
+    forkIO Gtk.mainGUI
 
     let s = Session {
                     sWindow  = window,
@@ -199,7 +199,7 @@
         return ((Session win canvas svg), (canvas))
 
     -- hides expose events!
-    G.widgetQueueDraw c
+    Gtk.widgetQueueDraw c
     yield
     return ()
 
@@ -214,14 +214,14 @@
    svgstring <- myReadProcess exe ["-Tsvg"] dot
    writeFile file svgstring
 
-updateCanvas :: C.SVG -> G.DrawingArea  -> IO Bool
+updateCanvas :: C.SVG -> Gtk.DrawingArea  -> IO Bool
 updateCanvas svg canvas = do
-    win             <- G.widgetGetDrawWindow canvas
-    (width, height) <- G.widgetGetSize canvas
+    win             <- Gtk.widgetGetDrawWindow canvas
+    (width, height) <- Gtk.widgetGetSize canvas
     let (w,h)   = (fromIntegral width,fromIntegral height)
         (sw,sh) = C.svgGetSize svg
 
-    G.renderWithDrawable win $ do
+    Gtk.renderWithDrawable win $ do
 
         C.setAntialias C.AntialiasDefault
         C.setLineCap C.LineCapSquare
@@ -248,26 +248,26 @@
 renderableToWindow chart = do
     svg <- C.svgNewFromString chart
 
-    G.unsafeInitGUIForThreadedRTS
+    Gtk.unsafeInitGUIForThreadedRTS
     -- G.initGUI
-    window <- G.windowNew
-    canvas <- G.drawingAreaNew
+    window <- Gtk.windowNew
+    canvas <- Gtk.drawingAreaNew
     -- fix size
     --   G.windowSetResizable window False
 --    G.widgetSetSizeRequest window windowWidth windowHeight
 
     -- press any key to quit
-    G.onKeyPress window $ \e -> case e of
+    Gtk.onKeyPress window $ \e -> case e of
          G.Key {G.eventKeyName=key}
             | key == "r" -> do
                 return True
-         _               -> anyKey (G.widgetDestroy window) e
+         _               -> anyKey (Gtk.widgetDestroy window) e
 
-    G.onDestroy window G.mainQuit
-    G.onExpose canvas $ const (updateCanvas svg canvas)
-    G.set window [G.containerChild G.:= canvas]
-    G.widgetShowAll window
-    G.mainGUI
+    Gtk.onDestroy window Gtk.mainQuit
+    Gtk.onExpose canvas $ const (updateCanvas svg canvas)
+    Gtk.set window [Gtk.containerChild Gtk.:= canvas]
+    Gtk.widgetShowAll window
+    Gtk.mainGUI
 
 ------------------------------------------------------------------------
 -- Talking to dot