[Gtk2hs-commit] (main branch): Fix GError functions

[Andy S. <And...@co...>]

diffing dir...
Mon Aug 30 03:01:28 EDT 2010  Andy Stewart <laz...@gm...>
  * Fix GError functions
  Ignore-this: 8b6da2b20a648be0751861498161b50f
    {
    hunk ./gio/System/GIO/Async/Cancellable.chs 54
    +import Data.Maybe (fromMaybe)
    hunk ./gio/System/GIO/Async/Cancellable.chs 59
    -{#import System.GIO.Base#}
    hunk ./gio/System/GIO/Async/Cancellable.chs 82
    --- | If the cancellable is cancelled, sets the error to notify that the operation was cancelled.
    -cancellableThrowErrorIfCancelled :: Cancellable [_$_]
    - -> IO Bool  -- ^ returns     'True' if cancellable was cancelled, 'False' if it was not. [_$_]
    +-- | If the cancellable is cancelled, throws a 'GError' to notify that the operation was cancelled.
    +cancellableThrowErrorIfCancelled :: Cancellable -> IO ()
    hunk ./gio/System/GIO/Async/Cancellable.chs 85
    -    liftM toBool $
    -    propagateGError $ \gErrorPtr -> [_$_]
    +    propagateGError $ \gErrorPtr -> do
    hunk ./gio/System/GIO/Async/Cancellable.chs 87
    +      return ()
    hunk ./gio/System/GIO/Async/Cancellable.chs 99
    -    maybeWith withGObject cancellable g_cancellable_pop_current
    -    where
    -      _ = {# call cancellable_pop_current #}
    +      {# call cancellable_pop_current #}
    +         (fromMaybe (Cancellable nullForeignPtr) cancellable) [_$_]
    hunk ./gio/System/GIO/Async/Cancellable.chs 112
    -    maybeWith withGObject cancellable g_cancellable_push_current
    -    where
    -      _ = {# call cancellable_push_current #}
    +      {# call cancellable_push_current #}
    +         (fromMaybe (Cancellable nullForeignPtr) cancellable) [_$_]
    }