[Gtk2hs-commit] (main branch): modify foreign import functions for ghc-7.6 compatibility

[Daniel W. <dm...@lu...>]

diffing dir...
Wed Sep 26 01:54:09 BST 2012  jw...@gm...
  * modify foreign import functions for ghc-7.6 compatibility
  Ignore-this: 5d912e2b7782f0f002e88e76d0b52b26
  
  ghc-7.6 appears to be much more restrictive when coercing types of functions
  imported via the FFI than previous versions.  Before, unused arguments could be
  omitted, and types such as 'Ptr NewtypeWrapper' were allowed.  ghc-7.6 no
  longer seems to accept these, so some wrapped functions needed to have
  arguments added or argument types changed.
  
  The changed argument types are strictly in internal APIs, so a major version
  bump is not necessary.
    hunk ./gio/System/GIO/Async/AsyncResult.chs 50
    -    (Ptr GObject -> Ptr AsyncResult -> Ptr () -> IO ()) -> IO GAsyncReadyCallback
    +    (Ptr () -> Ptr AsyncResult -> Ptr () -> IO ()) -> IO GAsyncReadyCallback
    hunk ./gio/System/GIO/Async/AsyncResult.chs 55
    -      object <- (makeNewGObject mkGObject . return) cObject
    +      object <- (makeNewGObject mkGObject . return) (castPtr cObject)
    hunk ./glib/System/Glib/GObject.chs 130
    -foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify
    -
    hunk ./glib/System/Glib/MainLoop.chs 74
    -foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc
    +foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc
    hunk ./glib/System/Glib/MainLoop.chs 82
    -  funPtr <- mkSourceFunc fun
    +  funPtr <- mkSourceFunc (const fun)
    hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 129
    -foreign import ccall "wrapper" mkDestructor :: IO () -> IO GWeakNotify
    +foreign import ccall "wrapper" mkDestructor
    +  :: (Ptr () -> Ptr GObject -> IO ()) -> IO GWeakNotify
    hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 138
    -  uFunPtr <- mkDestructor $ do
    +  uFunPtr <- mkDestructor $ \_ _ -> do
    hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs 263
    -    (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ())
    +    (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ())
    hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs 285
    -  (Ptr Clipboard -> Ptr () -> {#type guint#} -> IO ()) -> IO ClipboardGetFunc
    +  (Ptr Clipboard -> Ptr () -> {#type guint#} -> Ptr () -> IO ()) -> IO ClipboardGetFunc
    hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs 316
    -    (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ())
    +    (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ())
    hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs 407
    -    (\_ sPtr -> do
    +    (\_ sPtr _ -> do
    hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs 421
    -  (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc
    +  (Ptr Clipboard -> Ptr () -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc
    hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs 442
    -    (\_ sPtr -> do
    +    (\_ sPtr _ -> do
    hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs 456
    -  (Ptr Clipboard -> CString -> IO ()) -> IO ClipboardTextReceivedFunc
    +  (Ptr Clipboard -> CString -> Ptr () -> IO ()) -> IO ClipboardTextReceivedFunc
    hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs 480
    -    (\_ sPtr -> do
    +    (\_ sPtr _ -> do
    hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs 493
    -  (Ptr Clipboard -> Ptr Pixbuf -> IO ()) -> IO ClipboardImageReceivedFunc
    +  (Ptr Clipboard -> Ptr Pixbuf -> Ptr () -> IO ()) -> IO ClipboardImageReceivedFunc
    hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs 516
    -    (\_ tPtr len -> do
    +    (\_ tPtr len _ -> do
    hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs 531
    -  (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> IO ()) -> IO ClipboardTargetsReceivedFunc
    +  (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> Ptr () -> IO ()) -> IO ClipboardTargetsReceivedFunc
    hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs 555
    -    (\_ tPtr sPtr len -> do
    +    (\_ tPtr sPtr len _ -> do
    hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs 558
    -        str <- peekUTFStringLen (sPtr,fromIntegral len)
    +        str <- peekUTFStringLen (castPtr sPtr,fromIntegral len)
    hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs 571
    -  (Ptr Clipboard -> Ptr () -> CString -> {#type gsize#} -> IO ()) ->
    +  (Ptr Clipboard -> Ptr () -> Ptr CUChar -> {#type gsize#} -> Ptr () -> IO ()) ->
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 496
    -  funPtr <- mkRowSeparatorFunc $ \_ iterPtr -> do
    +  funPtr <- mkRowSeparatorFunc $ \_ iterPtr _ -> do
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 499
    -        return (extract value)
    +        return (fromBool $ extract value)
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 506
    -  (Ptr TreeModel -> Ptr TreeIter -> IO Bool) -> IO TreeViewRowSeparatorFunc
    +  (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean #}) -> IO TreeViewRowSeparatorFunc
    hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs 430
    -  (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt) ->
    +  (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO CInt) ->
    hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 163
    -  (Ptr TreeModelFilter -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) ->
    +  (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) ->
    hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs 154
    -  fPtr <- mkTreeSelectionFunc (\_ _ tp _ -> do
    +  fPtr <- mkTreeSelectionFunc (\_ _ tp _ _ -> do
    hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs 171
    -  (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO CInt)->
    +  (Ptr TreeSelection -> Ptr TreeModel -> Ptr NativeTreePath -> {#type gint#} -> Ptr () -> IO CInt)->
    hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs 202
    -  fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr -> do
    +  fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr _ -> do
    hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs 222
    -  (Ptr () -> Ptr () -> Ptr TreeIter -> IO ()) -> IO TreeSelectionForeachFunc
    +  (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO ()) -> IO TreeSelectionForeachFunc
    hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 585
    -  (Ptr () -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn ->
    +  (Ptr TreeView -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn ->
    hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 801
    -  (Ptr () -> Ptr NativeTreePath -> Ptr () -> IO ()) ->
    +  (Ptr TreeView -> Ptr NativeTreePath -> Ptr () -> IO ()) ->
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextIter.chs 800
    -  ({#type gunichar#} -> Ptr () -> {#type gboolean#}) -> IO TextCharPredicate
    +  ({#type gunichar#} -> Ptr () -> IO {#type gboolean#}) -> IO TextCharPredicate
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextIter.chs 813
    -  fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c)))
    +  fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c)))
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextIter.chs 830
    -  fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c)))
    +  fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c)))
    hunk ./gtk/Graphics/UI/Gtk/Windows/Assistant.chs 277
    -  ({#type glong#} -> Ptr () -> IO {#type glong#})
    +  ({#type gint#} -> Ptr () -> IO {#type gint#})