diff --git a/Gtk2HsSetup.hs b/Gtk2HsSetup.hs --- a/Gtk2HsSetup.hs +++ b/Gtk2HsSetup.hs @@ -129,7 +129,7 @@ Just ('.':_) -> True Just ('-':n:_) | isNumber n -> True _ -> False - + -- The following code is a big copy-and-paste job from the sources of -- Cabal 1.8 just to be able to fix a field in the package file. Yuck. diff --git a/SetupMain.hs b/SetupMain.hs --- a/SetupMain.hs +++ b/SetupMain.hs @@ -10,4 +10,4 @@ main = do checkGtk2hsBuildtools [typeGenProgram, signalGenProgram, c2hsLocal] defaultMainWithHooks gtk2hsUserHooks - + diff --git a/System/GIO.hs b/System/GIO.hs --- a/System/GIO.hs +++ b/System/GIO.hs @@ -9,20 +9,20 @@ -- modify it under the terms of the GNU Lesser General Public License -- as published by the Free Software Foundation, either version 3 of -- the License, or (at your option) any later version. --- +-- -- This library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. --- +-- -- You should have received a copy of the GNU Lesser General Public -- License along with this program. If not, see -- . --- +-- -- GIO, the C library which this Haskell library depends on, is -- available under LGPL Version 2. The documentation included with -- this library is based on the original GIO documentation. --- +-- -- | Maintainer : gtk2hs-devel@lists.sourceforge.net -- Stability : alpha -- Portability : portable (depends on GHC) diff --git a/System/GIO/Async/AsyncResult.chs b/System/GIO/Async/AsyncResult.chs --- a/System/GIO/Async/AsyncResult.chs +++ b/System/GIO/Async/AsyncResult.chs @@ -10,20 +10,20 @@ -- modify it under the terms of the GNU Lesser General Public License -- as published by the Free Software Foundation, either version 3 of -- the License, or (at your option) any later version. --- +-- -- This library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. --- +-- -- You should have received a copy of the GNU Lesser General Public -- License along with this program. If not, see -- . --- +-- -- GIO, the C library which this Haskell library depends on, is -- available under LGPL Version 2. The documentation included with -- this library is based on the original GIO documentation. --- +-- -- | Maintainer : gtk2hs-devel@lists.sourceforge.net -- Stability : alpha -- Portability : portable (depends on GHC) @@ -46,11 +46,11 @@ {#pointer GAsyncReadyCallback#} -foreign import ccall "wrapper" mkAsyncReadyCallback :: +foreign import ccall "wrapper" mkAsyncReadyCallback :: (Ptr () -> Ptr AsyncResult -> Ptr () -> IO ()) -> IO GAsyncReadyCallback marshalAsyncReadyCallback :: AsyncReadyCallback -> IO GAsyncReadyCallback -marshalAsyncReadyCallback asyncReadyCallback = +marshalAsyncReadyCallback asyncReadyCallback = mkAsyncReadyCallback $ \ cObject cAsyncResult cCallback -> do object <- (makeNewGObject mkGObject . return) (castPtr cObject) asyncResult <- (makeNewGObject mkAsyncResult . return) cAsyncResult diff --git a/System/GIO/Async/Cancellable.chs b/System/GIO/Async/Cancellable.chs --- a/System/GIO/Async/Cancellable.chs +++ b/System/GIO/Async/Cancellable.chs @@ -10,20 +10,20 @@ -- modify it under the terms of the GNU Lesser General Public License -- as published by the Free Software Foundation, either version 3 of -- the License, or (at your option) any later version. --- +-- -- This library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. --- +-- -- You should have received a copy of the GNU Lesser General Public -- License along with this program. If not, see -- . --- +-- -- GIO, the C library which this Haskell library depends on, is -- available under LGPL Version 2. The documentation included with -- this library is based on the original GIO documentation. --- +-- -- | Maintainer : gtk2hs-devel@lists.sourceforge.net -- Stability : alpha -- Portability : portable (depends on GHC) @@ -32,11 +32,11 @@ -- | 'Cancellable' is a thread-safe operation cancellation stack used throughout GIO to allow for -- cancellation of synchronous and asynchronous operations. --- * Types +-- * Types Cancellable (..), CancellableClass, --- * Methods +-- * Methods cancellableNew, cancellableIsCancelled, cancellableThrowErrorIfCancelled, @@ -62,10 +62,10 @@ {# context lib = "gio" prefix = "g" #} -- | Creates a new 'Cancellable' object. --- +-- -- Applications that want to start one or more operations that should be cancellable should create a -- 'Cancellable' and pass it to the operations. --- +-- -- One 'Cancellable' can be used in multiple consecutive operations, but not in multiple concurrent -- operations. cancellableNew :: IO Cancellable @@ -74,7 +74,7 @@ {# call cancellable_new #} -- | Checks if a cancellable job has been cancelled. -cancellableIsCancelled :: Cancellable +cancellableIsCancelled :: Cancellable -> IO Bool -- ^ returns 'True' if cancellable is cancelled, 'False' if called with 'Nothing' or if item is not cancelled. cancellableIsCancelled = liftM toBool . {# call cancellable_is_cancelled #} @@ -87,30 +87,30 @@ return () -- | Gets the top cancellable from the stack. -cancellableGetCurrent :: +cancellableGetCurrent :: IO (Maybe Cancellable) -- ^ returns a 'Cancellable' from the top of the stack, or 'Nothing' if the stack is empty. cancellableGetCurrent = maybeNull (makeNewGObject mkCancellable) $ - {# call cancellable_get_current #} + {# call cancellable_get_current #} -- | Pops cancellable off the cancellable stack (verifying that cancellable is on the top of the stack). cancellablePopCurrent :: Maybe Cancellable -> IO () cancellablePopCurrent cancellable = {# call cancellable_pop_current #} - (fromMaybe (Cancellable nullForeignPtr) cancellable) + (fromMaybe (Cancellable nullForeignPtr) cancellable) -- | Pushes cancellable onto the cancellable stack. The current cancllable can then be recieved using -- 'cancellableGetCurrent' . --- +-- -- This is useful when implementing cancellable operations in code that does not allow you to pass down -- the cancellable object. --- +-- -- This is typically called automatically by e.g. 'File' operations, so you rarely have to call this -- yourself. cancellablePushCurrent :: Maybe Cancellable -> IO () cancellablePushCurrent cancellable = {# call cancellable_push_current #} - (fromMaybe (Cancellable nullForeignPtr) cancellable) + (fromMaybe (Cancellable nullForeignPtr) cancellable) -- | Resets cancellable to its uncancelled state. cancellableReset :: Cancellable -> IO () @@ -118,10 +118,10 @@ -- | Will set cancellable to cancelled, and will emit the "cancelled" signal. (However, see the warning -- about race conditions in the documentation for that signal if you are planning to connect to it.) --- +-- -- This function is thread-safe. In other words, you can safely call it from a thread other than the -- one running the operation that was passed the cancellable. --- +-- -- The convention within gio is that cancelling an asynchronous operation causes it to complete -- asynchronously. That is, if you cancel the operation from the same thread in which it is running, -- then the operation's 'AsyncReadyCallback' will not be invoked until the application returns to the @@ -130,15 +130,15 @@ cancellableCancel = {# call cancellable_cancel #} -- | Emitted when the operation has been cancelled. --- +-- -- Can be used by implementations of cancellable operations. If the operation is cancelled from another -- thread, the signal will be emitted in the thread that cancelled the operation, not the thread that -- is running the operation. --- +-- -- Note that disconnecting from this signal (or any signal) in a multi-threaded program is prone to -- race conditions. For instance it is possible that a signal handler may be invoked even after a call -- to 'signalHandlerDisconnect' for that handler has already returned. --- +-- -- There is also a problem when cancellation happen right before connecting to the signal. If this -- happens the signal will unexpectedly not be emitted, and checking before connecting to the signal -- leaves a race condition where this is still happening. diff --git a/System/GIO/Enums.chs b/System/GIO/Enums.chs --- a/System/GIO/Enums.chs +++ b/System/GIO/Enums.chs @@ -10,20 +10,20 @@ -- modify it under the terms of the GNU Lesser General Public License -- as published by the Free Software Foundation, either version 3 of -- the License, or (at your option) any later version. --- +-- -- This library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. --- +-- -- You should have received a copy of the GNU Lesser General Public -- License along with this program. If not, see -- . --- +-- -- GIO, the C library which this Haskell library depends on, is -- available under LGPL Version 2. The documentation included with -- this library is based on the original GIO documentation. --- +-- -- | Maintainer : gtk2hs-devel@lists.sourceforge.net -- Stability : alpha -- Portability : portable (depends on GHC) diff --git a/System/GIO/File/FileAttribute.hsc b/System/GIO/File/FileAttribute.hsc --- a/System/GIO/File/FileAttribute.hsc +++ b/System/GIO/File/FileAttribute.hsc @@ -3,7 +3,7 @@ -- -*-haskell-*- #include - + -- GIMP Toolkit (GTK) Binding for Haskell: binding to gio -*-haskell-*- -- -- Author : Peter Gavin, Andy Stewart @@ -16,51 +16,51 @@ -- modify it under the terms of the GNU Lesser General Public License -- as published by the Free Software Foundation, either version 3 of -- the License, or (at your option) any later version. --- +-- -- This library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. --- +-- -- You should have received a copy of the GNU Lesser General Public -- License along with this program. If not, see -- . --- +-- -- GIO, the C library which this Haskell library depends on, is -- available under LGPL Version 2. The documentation included with -- this library is based on the original GIO documentation. --- +-- -- | Maintainer : gtk2hs-devel@lists.sourceforge.net -- Stability : alpha -- Portability : portable (depends on GHC) module System.GIO.File.FileAttribute ( --- * Details +-- * Details -- | File attributes in GIO consist of a list of key-value pairs. --- +-- -- Keys are strings that contain a key namespace and a key name, separated by a colon, -- e.g. "namespace:keyname". Namespaces are included to sort key-value pairs by namespaces for -- relevance. Keys can be retrived using wildcards, e.g. \"standard::*\" will return all of the keys in -- the "standard" namespace. --- +-- -- Values are stored within the list in 'FileAttributeValue' structures. Values can store different -- types, listed in the enum 'FileAttributeType'. Upon creation of a 'FileAttributeValue', the type will -- be set to 'FileAttributeTypeInvalid'. --- +-- -- The list of possible attributes for a filesystem (pointed to by a 'File') is availible as a -- 'FileAttributeInfoList'. This list is queryable by key names as indicated earlier. --- +-- -- Classes that implement 'FileIface' will create a 'FileAttributeInfoList' and install default keys and -- values for their given file system, architecture, and other possible implementation details (e.g., -- on a UNIX system, a file attribute key will be registered for the user id for a given file). - --- * Types + +-- * Types FileAttributeType (..), FileAttributeInfo (..), - --- * Enums + +-- * Enums FileAttributeInfoFlags (..), - --- * Methods + +-- * Methods fileAttributeStandardType, fileAttributeStandardIsHidden, fileAttributeStandardIsBackup, @@ -76,7 +76,7 @@ fileAttributeStandardSize, #if GLIB_CHECK_VERSION(2,20,0) fileAttributeStandardAllocatedSize, -#endif +#endif fileAttributeStandardSymlinkTarget, fileAttributeStandardTargetURI, fileAttributeStandardSortOrder, @@ -95,12 +95,12 @@ fileAttributeMountableUnixDevice, #if GLIB_CHECK_VERSION(2,22,0) fileAttributeMountableUnixDeviceFile, - fileAttributeMountableCanStart, + fileAttributeMountableCanStart, fileAttributeMountableCanDegraded, - fileAttributeMountableCanStop, + fileAttributeMountableCanStop, fileAttributeMountableStartStopType, fileAttributeMountableCanPoll, -#endif +#endif fileAttributeMountableHalUDI, fileAttributeTimeModified, fileAttributeTimeModifiedUSec, @@ -129,7 +129,7 @@ fileAttributeThumbnailingFailed, #if GLIB_CHECK_VERSION(2,20,0) fileAttributePreviewIcon, -#endif +#endif fileAttributeFilesystemSize, fileAttributeFilesystemFree, fileAttributeFilesystemType, @@ -142,7 +142,7 @@ #if GLIB_CHECK_VERSION(2,24,0) fileAttributeTrashOrigPath, fileAttributeTrashDeletionDate, -#endif +#endif ) where @@ -163,7 +163,7 @@ | FileAttributeTypeObject #if GLIB_CHECK_VERSION(2,22,0) | FileAttributeTypeStringList -#endif +#endif deriving (Eq, Ord, Bounded, Show, Read) instance Enum FileAttributeType where toEnum #{const G_FILE_ATTRIBUTE_TYPE_INVALID} = FileAttributeTypeInvalid @@ -177,8 +177,8 @@ toEnum #{const G_FILE_ATTRIBUTE_TYPE_OBJECT} = FileAttributeTypeObject #if GLIB_CHECK_VERSION(2,22,0) toEnum #{const G_FILE_ATTRIBUTE_TYPE_STRINGV} = FileAttributeTypeStringList -#endif - +#endif + fromEnum FileAttributeTypeInvalid = #{const G_FILE_ATTRIBUTE_TYPE_INVALID} fromEnum FileAttributeTypeString = #{const G_FILE_ATTRIBUTE_TYPE_STRING} fromEnum FileAttributeTypeByteString = #{const G_FILE_ATTRIBUTE_TYPE_BYTE_STRING} @@ -228,7 +228,7 @@ fileAttributeStandardSize, #if GLIB_CHECK_VERSION(2,20,0) fileAttributeStandardAllocatedSize, -#endif +#endif fileAttributeStandardSymlinkTarget, fileAttributeStandardTargetURI, fileAttributeStandardSortOrder, @@ -252,7 +252,7 @@ fileAttributeMountableCanStop, fileAttributeMountableStartStopType, fileAttributeMountableCanPoll, -#endif +#endif fileAttributeMountableHalUDI, fileAttributeTimeModified, fileAttributeTimeModifiedUSec, @@ -280,8 +280,8 @@ fileAttributeThumbnailPath, fileAttributeThumbnailingFailed, #if GLIB_CHECK_VERSION(2,20,0) - fileAttributePreviewIcon, -#endif + fileAttributePreviewIcon, +#endif fileAttributeFilesystemSize, fileAttributeFilesystemFree, fileAttributeFilesystemType, @@ -293,7 +293,7 @@ #if GLIB_CHECK_VERSION(2,24,0) fileAttributeTrashOrigPath, fileAttributeTrashDeletionDate, -#endif +#endif fileAttributeStandardDescription :: String fileAttributeStandardType = #{const_str G_FILE_ATTRIBUTE_STANDARD_TYPE} @@ -311,7 +311,7 @@ fileAttributeStandardSize = #{const_str G_FILE_ATTRIBUTE_STANDARD_SIZE} #if GLIB_CHECK_VERSION(2,20,0) fileAttributeStandardAllocatedSize = #{const_str G_FILE_ATTRIBUTE_STANDARD_ALLOCATED_SIZE} -#endif +#endif fileAttributeStandardSymlinkTarget = #{const_str G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET} fileAttributeStandardTargetURI = #{const_str G_FILE_ATTRIBUTE_STANDARD_TARGET_URI} fileAttributeStandardSortOrder = #{const_str G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER} @@ -336,7 +336,7 @@ fileAttributeMountableStartStopType = #{const_str G_FILE_ATTRIBUTE_MOUNTABLE_START_STOP_TYPE} fileAttributeMountableCanPoll = #{const_str G_FILE_ATTRIBUTE_MOUNTABLE_CAN_POLL} fileAttributeMountableIsMediaCheckAutomatic = #{const_str G_FILE_ATTRIBUTE_MOUNTABLE_IS_MEDIA_CHECK_AUTOMATIC} -#endif +#endif fileAttributeMountableHalUDI = #{const_str G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI} fileAttributeTimeModified = #{const_str G_FILE_ATTRIBUTE_TIME_MODIFIED} fileAttributeTimeModifiedUSec = #{const_str G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC} @@ -365,7 +365,7 @@ fileAttributeThumbnailingFailed = #{const_str G_FILE_ATTRIBUTE_THUMBNAILING_FAILED} #if GLIB_CHECK_VERSION(2,20,0) fileAttributePreviewIcon = #{const_str G_FILE_ATTRIBUTE_PREVIEW_ICON} -#endif +#endif fileAttributeFilesystemSize = #{const_str G_FILE_ATTRIBUTE_FILESYSTEM_SIZE} fileAttributeFilesystemFree = #{const_str G_FILE_ATTRIBUTE_FILESYSTEM_FREE} fileAttributeFilesystemType = #{const_str G_FILE_ATTRIBUTE_FILESYSTEM_TYPE} @@ -378,4 +378,4 @@ #if GLIB_CHECK_VERSION(2,24,0) fileAttributeTrashOrigPath = #{const_str G_FILE_ATTRIBUTE_TRASH_ORIG_PATH} fileAttributeTrashDeletionDate = #{const_str G_FILE_ATTRIBUTE_TRASH_DELETION_DATE} -#endif +#endif diff --git a/System/GIO/File/FileEnumerator.chs b/System/GIO/File/FileEnumerator.chs --- a/System/GIO/File/FileEnumerator.chs +++ b/System/GIO/File/FileEnumerator.chs @@ -10,20 +10,20 @@ -- modify it under the terms of the GNU Lesser General Public License -- as published by the Free Software Foundation, either version 3 of -- the License, or (at your option) any later version. --- +-- -- This library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. --- +-- -- You should have received a copy of the GNU Lesser General Public -- License along with this program. If not, see -- . --- +-- -- GIO, the C library which this Haskell library depends on, is -- available under LGPL Version 2. The documentation included with -- this library is based on the original GIO documentation. --- +-- -- | Maintainer : gtk2hs-devel@lists.sourceforge.net -- Stability : alpha -- Portability : portable (depends on GHC) @@ -33,14 +33,14 @@ -- | 'FileEnumerator' allows you to operate on a set of 'File's, returning a 'FileInfo' structure for each -- file enumerated (e.g. 'fileEnumerateChildren' will return a 'FileEnumerator' for each of the -- children within a directory). --- +-- -- To get the next file's information from a 'FileEnumerator', use 'fileEnumeratorNextFile' or its -- asynchronous version, 'fileEnumeratorNextFilesAsync'. Note that the asynchronous version will -- return a list of 'FileInfo', whereas the synchronous will only return the next file in the -- enumerator. --- +-- -- To close a 'FileEnumerator', use 'fileEnumeratorClose', or its asynchronous version, --- 'fileEnumeratorCloseAsync'. +-- 'fileEnumeratorCloseAsync'. -- -- * Types FileEnumerator (..), @@ -78,59 +78,59 @@ -- | Returns information for the next file in the enumerated object. Will block until the information is -- available. The 'FileInfo' returned from this function will contain attributes that match the -- attribute string that was passed when the 'FileEnumerator' was created. --- +-- -- On error, a 'GError' is thrown. If the enumerator is at the end, 'Nothing' will be -- returned. fileEnumeratorNextFile :: FileEnumeratorClass enumerator => enumerator -> Maybe Cancellable -- ^ @cancellable@ optional 'Cancellable' object, 'Nothing' to ignore. - -> IO (Maybe FileInfo) -- ^ returns A 'FileInfo' or 'Nothing' on error or end of enumerator. + -> IO (Maybe FileInfo) -- ^ returns A 'FileInfo' or 'Nothing' on error or end of enumerator. fileEnumeratorNextFile enumerator cancellable = - checkGError ( \gErrorPtr -> + checkGError ( \gErrorPtr -> maybeNull (makeNewGObject mkFileInfo) $ - {#call g_file_enumerator_next_file #} - (toFileEnumerator enumerator) - (fromMaybe (Cancellable nullForeignPtr) cancellable) + {#call g_file_enumerator_next_file #} + (toFileEnumerator enumerator) + (fromMaybe (Cancellable nullForeignPtr) cancellable) gErrorPtr) (\ _ -> return Nothing) - + -- | Releases all resources used by this enumerator, making the enumerator return GIoErrorClosed on -- all calls. --- +-- -- This will be automatically called when the last reference is dropped, but you might want to call -- this function to make sure resources are released as early as possible. -- -- Throws a 'GError' if an error occurs. fileEnumeratorClose :: FileEnumeratorClass enumerator => enumerator - -> Maybe Cancellable -- ^ @cancellable@ optional 'Cancellable' object, 'Nothing' to ignore. + -> Maybe Cancellable -- ^ @cancellable@ optional 'Cancellable' object, 'Nothing' to ignore. -> IO () fileEnumeratorClose enumerator cancellable = propagateGError $ \gErrorPtr -> do - {#call g_file_enumerator_close#} - (toFileEnumerator enumerator) - (fromMaybe (Cancellable nullForeignPtr) cancellable) + {#call g_file_enumerator_close#} + (toFileEnumerator enumerator) + (fromMaybe (Cancellable nullForeignPtr) cancellable) gErrorPtr return () -- | Request information for a number of files from the enumerator asynchronously. When all i/o for the -- operation is finished the callback will be called with the requested information. --- +-- -- The callback can be called with less than @numFiles@ files in case of error or at the end of the -- enumerator. In case of a partial error the callback will be called with any succeeding items and no -- error, and on the next request the error will be reported. If a request is cancelled the callback -- will be called with 'IoErrorCancelled'. --- +-- -- During an async request no other sync and async calls are allowed, and will result in -- 'IoErrorPending' errors. --- +-- -- Any outstanding i/o request with higher priority (lower numerical value) will be executed before an -- outstanding request with lower priority. Default priority is GPriorityDefault. fileEnumeratorNextFilesAsync :: FileEnumeratorClass enumerator => enumerator - -> Int -- ^ @numFiles@ the number of file info objects to request - -> Int -- ^ @ioPriority@ the io priority of the request. - -> Maybe Cancellable -- ^ @cancellable@ optional 'Cancellable' object, 'Nothing' to ignore. - -> AsyncReadyCallback -- ^ @callback@ a 'AsyncReadyCallback' to call when the request is satisfied + -> Int -- ^ @numFiles@ the number of file info objects to request + -> Int -- ^ @ioPriority@ the io priority of the request. + -> Maybe Cancellable -- ^ @cancellable@ optional 'Cancellable' object, 'Nothing' to ignore. + -> AsyncReadyCallback -- ^ @callback@ a 'AsyncReadyCallback' to call when the request is satisfied -> IO () fileEnumeratorNextFilesAsync enumerator numFiles ioPriority cancellable callback = do cCallback <- marshalAsyncReadyCallback callback @@ -138,42 +138,42 @@ (toFileEnumerator enumerator) (fromIntegral numFiles) (fromIntegral ioPriority) - (fromMaybe (Cancellable nullForeignPtr) cancellable) + (fromMaybe (Cancellable nullForeignPtr) cancellable) cCallback (castFunPtrToPtr cCallback) - + -- | Finishes the asynchronous operation started with 'fileEnumeratorNextFilesAsync'. fileEnumeratorNextFilesFinish :: FileEnumeratorClass enumerator => enumerator -> AsyncResult -> IO [FileInfo] -fileEnumeratorNextFilesFinish enumerator asyncResult = - propagateGError ({# call g_file_enumerator_next_files_finish #} (toFileEnumerator enumerator) asyncResult) +fileEnumeratorNextFilesFinish enumerator asyncResult = + propagateGError ({# call g_file_enumerator_next_files_finish #} (toFileEnumerator enumerator) asyncResult) >>= \glistPtr -> do infoPtrs <- fromGList glistPtr mapM (makeNewGObject mkFileInfo . return) infoPtrs - + -- | Asynchronously closes the file enumerator. --- +-- -- If cancellable is not 'Nothing', then the operation can be cancelled by triggering the cancellable object -- from another thread. If the operation was cancelled, the error 'IoErrorCancelled' will be returned -- in 'fileEnumeratorCloseFinish'. fileEnumeratorCloseAsync :: FileEnumeratorClass enumerator => enumerator - -> Int -- ^ @ioPriority@ the I/O priority of the request. - -> Maybe Cancellable -- ^ @cancellable@ optional 'Cancellable' object, 'Nothing' to ignore. - -> AsyncReadyCallback -- ^ @callback@ a 'AsyncReadyCallback' to call when the request is satisfied + -> Int -- ^ @ioPriority@ the I/O priority of the request. + -> Maybe Cancellable -- ^ @cancellable@ optional 'Cancellable' object, 'Nothing' to ignore. + -> AsyncReadyCallback -- ^ @callback@ a 'AsyncReadyCallback' to call when the request is satisfied -> IO () fileEnumeratorCloseAsync enumerator ioPriority mbCancellable callback = do cCallback <- marshalAsyncReadyCallback callback {#call g_file_enumerator_close_async #} - (toFileEnumerator enumerator) + (toFileEnumerator enumerator) (fromIntegral ioPriority) - (fromMaybe (Cancellable nullForeignPtr) mbCancellable) + (fromMaybe (Cancellable nullForeignPtr) mbCancellable) cCallback (castFunPtrToPtr cCallback) -- | Finishes closing a file enumerator, started from 'fileEnumeratorCloseAsync'. --- +-- -- If the file enumerator was already closed when 'fileEnumeratorCloseAsync' was called, then this -- function will report GIoErrorClosed in error, and return 'False'. If the file enumerator had -- pending operation when the close operation was started, then this function will report @@ -183,24 +183,24 @@ fileEnumeratorCloseFinish :: FileEnumeratorClass enumerator => enumerator -> AsyncResult -> IO () -fileEnumeratorCloseFinish enumerator asyncResult = +fileEnumeratorCloseFinish enumerator asyncResult = propagateGError (\gErrorPtr -> do - {# call g_file_enumerator_close_finish #} - (toFileEnumerator enumerator) + {# call g_file_enumerator_close_finish #} + (toFileEnumerator enumerator) asyncResult gErrorPtr - return ()) + return ()) -- | Checks if the file enumerator has been closed. fileEnumeratorIsClosed :: FileEnumeratorClass enumerator => enumerator - -> IO Bool -- ^ returns 'True' if the enumerator is closed. + -> IO Bool -- ^ returns 'True' if the enumerator is closed. fileEnumeratorIsClosed enumerator = liftM toBool $ {#call g_file_enumerator_is_closed#} (toFileEnumerator enumerator) -- | Checks if the file enumerator has pending operations. fileEnumeratorHasPending :: FileEnumeratorClass enumerator => enumerator - -> IO Bool -- ^ returns 'True' if the enumerator has pending operations. + -> IO Bool -- ^ returns 'True' if the enumerator has pending operations. fileEnumeratorHasPending enumerator = liftM toBool $ {#call g_file_enumerator_has_pending#} (toFileEnumerator enumerator) diff --git a/System/GIO/File/FileMonitor.chs b/System/GIO/File/FileMonitor.chs --- a/System/GIO/File/FileMonitor.chs +++ b/System/GIO/File/FileMonitor.chs @@ -10,20 +10,20 @@ -- modify it under the terms of the GNU Lesser General Public License -- as published by the Free Software Foundation, either version 3 of -- the License, or (at your option) any later version. --- +-- -- This library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. --- +-- -- You should have received a copy of the GNU Lesser General Public -- License along with this program. If not, see -- . --- +-- -- GIO, the C library which this Haskell library depends on, is -- available under LGPL Version 2. The documentation included with -- this library is based on the original GIO documentation. --- +-- -- | Maintainer : gtk2hs-devel@lists.sourceforge.net -- Stability : alpha -- Portability : portable (depends on GHC) @@ -31,10 +31,10 @@ -- * Details -- -- | Monitors a file or directory for changes. --- +-- -- To obtain a 'FileMonitor' for a file or directory, use 'fileMonitor', or -- 'fileMonitorDirectory' . --- +-- -- To get informed about changes to the file or directory you are monitoring, connect to the "changed" -- signal. The signal will be emitted in the thread-default main context of the thread that the monitor -- was created in (though if the global default main context is blocked, this may cause notifications @@ -47,7 +47,7 @@ -- * Enums FileMonitorEvent(..), --- * Methods +-- * Methods fileMonitorCancel, fileMonitorIsCancelled, @@ -83,21 +83,21 @@ -- | Returns whether the monitor is canceled. fileMonitorIsCancelled :: FileMonitorClass monitor => monitor -> IO Bool -- ^ returns 'True' if monitor is canceled. 'False' otherwise. -fileMonitorIsCancelled monitor = +fileMonitorIsCancelled monitor = liftM toBool $ {#call g_file_monitor_is_cancelled#} (toFileMonitor monitor) -------------------- -- Attributes -- | Whether the monitor has been cancelled. --- +-- -- Default value: 'False' fileMonitorCancelled :: FileMonitorClass monitor => ReadAttr monitor Bool fileMonitorCancelled = readAttrFromBoolProperty "cancelled" -- | The limit of the monitor to watch for changes, in milliseconds. --- +-- -- Allowed values: >= 0 --- +-- -- Default value: 800 fileMonitorRateLimit :: FileMonitorClass monitor => Attr monitor Int fileMonitorRateLimit = newAttrFromIntProperty "rate-limit" diff --git a/System/GIO/File/IOError.chs b/System/GIO/File/IOError.chs --- a/System/GIO/File/IOError.chs +++ b/System/GIO/File/IOError.chs @@ -10,20 +10,20 @@ -- modify it under the terms of the GNU Lesser General Public License -- as published by the Free Software Foundation, either version 3 of -- the License, or (at your option) any later version. --- +-- -- This library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. --- +-- -- You should have received a copy of the GNU Lesser General Public -- License along with this program. If not, see -- . --- +-- -- GIO, the C library which this Haskell library depends on, is -- available under LGPL Version 2. The documentation included with -- this library is based on the original GIO documentation. --- +-- -- | Maintainer : gtk2hs-devel@lists.sourceforge.net -- Stability : alpha -- Portability : portable (depends on GHC) @@ -35,7 +35,7 @@ -- * Enums IOErrorEnum(..), --- * Methods +-- * Methods ioErrorFromErrno, ) where @@ -47,7 +47,7 @@ -- Methods -- | Converts errno.h error codes into GIO error codes. -ioErrorFromErrno :: Int -- ^ @err@ Error number as defined in errno.h. - -> IO IOErrorEnum -- ^ returns 'IOErrorEnum' value for the given errno.h error number. +ioErrorFromErrno :: Int -- ^ @err@ Error number as defined in errno.h. + -> IO IOErrorEnum -- ^ returns 'IOErrorEnum' value for the given errno.h error number. ioErrorFromErrno err = liftM (toEnum . fromIntegral) $ {#call g_io_error_from_errno#} (fromIntegral err) diff --git a/System/GIO/Icons/Emblem.chs b/System/GIO/Icons/Emblem.chs --- a/System/GIO/Icons/Emblem.chs +++ b/System/GIO/Icons/Emblem.chs @@ -10,20 +10,20 @@ -- modify it under the terms of the GNU Lesser General Public License -- as published by the Free Software Foundation, either version 3 of -- the License, or (at your option) any later version. --- +-- -- This library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. --- +-- -- You should have received a copy of the GNU Lesser General Public -- License along with this program. If not, see -- . --- +-- -- GIO, the C library which this Haskell library depends on, is -- available under LGPL Version 2. The documentation included with -- this library is based on the original GIO documentation. --- +-- -- | Maintainer : gtk2hs-devel@lists.sourceforge.net -- Stability : alpha -- Portability : portable (depends on GHC) @@ -32,7 +32,7 @@ -- -- | 'Emblem' is an implementation of 'Icon' that supports having an emblem, which is an icon with -- additional properties. It can than be added to a 'EmblemedIcon'. --- +-- -- Currently, only metainformation about the emblem's origin is supported. More may be added in the -- future. @@ -44,7 +44,7 @@ -- * Enums EmblemOrigin (..), --- * Methods +-- * Methods emblemNew, emblemNewWithOrigin, emblemGetIcon, @@ -70,20 +70,20 @@ emblemNew :: IconClass icon => icon -> IO Emblem emblemNew icon = wrapNewGObject mkEmblem $ - {#call g_emblem_new#} (toIcon icon) + {#call g_emblem_new#} (toIcon icon) -- | Creates a new emblem for icon. -emblemNewWithOrigin :: IconClass icon - => icon -- ^ @icon@ a 'Icon' containing the icon. - -> EmblemOrigin -- ^ @origin@ a 'EmblemOrigin' enum defining the emblem's origin +emblemNewWithOrigin :: IconClass icon + => icon -- ^ @icon@ a 'Icon' containing the icon. + -> EmblemOrigin -- ^ @origin@ a 'EmblemOrigin' enum defining the emblem's origin -> IO Emblem emblemNewWithOrigin icon origin = wrapNewGObject mkEmblem $ {#call g_emblem_new_with_origin#} (toIcon icon) ((fromIntegral . fromEnum) origin) -- | Gives back the icon from emblem. -emblemGetIcon :: EmblemClass emblem - => emblem -- ^ @emblem@ a 'Emblem' from which the icon should be extracted. +emblemGetIcon :: EmblemClass emblem + => emblem -- ^ @emblem@ a 'Emblem' from which the icon should be extracted. -> IO Icon -- ^ returns a 'Icon'. The returned object belongs to the emblem and should not be modified or freed. emblemGetIcon emblem = makeNewGObject mkIcon $ diff --git a/System/GIO/Icons/EmblemedIcon.chs b/System/GIO/Icons/EmblemedIcon.chs --- a/System/GIO/Icons/EmblemedIcon.chs +++ b/System/GIO/Icons/EmblemedIcon.chs @@ -10,20 +10,20 @@ -- modify it under the terms of the GNU Lesser General Public License -- as published by the Free Software Foundation, either version 3 of -- the License, or (at your option) any later version. --- +-- -- This library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. --- +-- -- You should have received a copy of the GNU Lesser General Public -- License along with this program. If not, see -- . --- +-- -- GIO, the C library which this Haskell library depends on, is -- available under LGPL Version 2. The documentation included with -- this library is based on the original GIO documentation. --- +-- -- | Maintainer : gtk2hs-devel@lists.sourceforge.net -- Stability : alpha -- Portability : portable (depends on GHC) @@ -32,12 +32,12 @@ -- -- | 'EmblemedIcon' is an implementation of 'Icon' that supports adding an emblem to an icon. Adding -- multiple emblems to an icon is ensured via 'emblemedIconAddEmblem'. --- +-- -- Note that 'Emblem'edIcon allows no control over the position of the emblems. See also 'Emblem' for -- more information. #if GLIB_CHECK_VERSION(2,18,0) --- * Types +-- * Types EmblemedIcon(..), EmblemedIconClass, @@ -46,7 +46,7 @@ emblemedIconGetIcon, emblemedIconGetEmblems, emblemedIconAddEmblem, -#endif +#endif ) where import Control.Monad @@ -67,30 +67,30 @@ -- | Creates a new emblemed icon for icon with the emblem emblem. emblemedIconNew :: (IconClass icon, EmblemClass emblem) => icon -> emblem -> IO EmblemedIcon emblemedIconNew icon emblem = - {#call g_emblemed_icon_new#} + {#call g_emblemed_icon_new#} (toIcon icon) (toEmblem emblem) >>= (constructNewGObject mkEmblemedIcon . return) . castPtr -- | Gets the main icon for emblemed. emblemedIconGetIcon :: EmblemedIconClass emblemed => emblemed - -> IO Icon -- ^ returns a 'Icon' that is owned by emblemed + -> IO Icon -- ^ returns a 'Icon' that is owned by emblemed emblemedIconGetIcon emblemed = makeNewGObject mkIcon $ - {#call g_emblemed_icon_get_icon#} (toEmblemedIcon emblemed) + {#call g_emblemed_icon_get_icon#} (toEmblemedIcon emblemed) -- | Gets the list of emblems for the icon. emblemedIconGetEmblems :: EmblemedIconClass emblemed => emblemed - -> IO [Emblem] -- ^ returns a list of 'Emblem' s that is owned by emblemed + -> IO [Emblem] -- ^ returns a list of 'Emblem' s that is owned by emblemed emblemedIconGetEmblems emblemed = do glistPtr <- {#call g_emblemed_icon_get_emblems#} (toEmblemedIcon emblemed) emblemPtrs <- readGList glistPtr mapM (makeNewGObject mkEmblem . return) emblemPtrs -- | Adds emblem to the 'Emblem'. -emblemedIconAddEmblem :: EmblemedIconClass emblemed => emblemed +emblemedIconAddEmblem :: EmblemedIconClass emblemed => emblemed -> Emblem -> IO () -emblemedIconAddEmblem emblemed emblem = +emblemedIconAddEmblem emblemed emblem = {#call g_emblemed_icon_add_emblem#} (toEmblemedIcon emblemed) emblem diff --git a/System/GIO/Icons/FileIcon.chs b/System/GIO/Icons/FileIcon.chs --- a/System/GIO/Icons/FileIcon.chs +++ b/System/GIO/Icons/FileIcon.chs @@ -10,20 +10,20 @@ -- modify it under the terms of the GNU Lesser General Public License -- as published by the Free Software Foundation, either version 3 of -- the License, or (at your option) any later version. --- +-- -- This library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. --- +-- -- You should have received a copy of the GNU Lesser General Public -- License along with this program. If not, see -- . --- +-- -- GIO, the C library which this Haskell library depends on, is -- available under LGPL Version 2. The documentation included with -- this library is based on the original GIO documentation. --- +-- -- | Maintainer : gtk2hs-devel@lists.sourceforge.net -- Stability : alpha -- Portability : portable (depends on GHC) @@ -32,7 +32,7 @@ -- -- | 'FileIcon' specifies an icon by pointing to an image file to be used as icon. --- * Types +-- * Types FileIcon(..), FileIconClass, diff --git a/System/GIO/Icons/Icon.chs b/System/GIO/Icons/Icon.chs --- a/System/GIO/Icons/Icon.chs +++ b/System/GIO/Icons/Icon.chs @@ -10,20 +10,20 @@ -- modify it under the terms of the GNU Lesser General Public License -- as published by the Free Software Foundation, either version 3 of -- the License, or (at your option) any later version. --- +-- -- This library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. --- +-- -- You should have received a copy of the GNU Lesser General Public -- License along with this program. If not, see -- . --- +-- -- GIO, the C library which this Haskell library depends on, is -- available under LGPL Version 2. The documentation included with -- this library is based on the original GIO documentation. --- +-- -- | Maintainer : gtk2hs-devel@lists.sourceforge.net -- Stability : alpha -- Portability : portable (depends on GHC) @@ -32,17 +32,17 @@ -- -- | 'Icon' is a very minimal interface for icons. It provides functions for checking the equality of two -- icons, hashing of icons and serializing an icon to and from strings. --- +-- -- 'Icon' does not provide the actual pixmap for the icon as this is out of GIO's scope, however -- implementations of 'Icon' may contain the name of an icon (see 'ThemedIcon'), or the path to an icon -- (see GLoadableIcon). --- +-- -- To obtain a hash of a 'Icon', see 'iconHash'. --- +-- -- To check if two 'Icon's are equal, see 'iconEqual'. --- +-- -- For serializing a 'Icon', use 'iconToString'. --- +-- -- If your application or library provides one or more 'Icon' implementations you need to ensure that -- each GType is registered with the type system prior to calling 'iconNewForString'. @@ -74,7 +74,7 @@ -- | Checks if two icons are equal. iconEqual :: (IconClass icon1, IconClass icon2) => icon1 -> icon2 - -> IO Bool -- ^ returns 'True' if icon1 is equal to icon2. 'False' otherwise. + -> IO Bool -- ^ returns 'True' if icon1 is equal to icon2. 'False' otherwise. iconEqual icon1 icon2 = liftM toBool $ {#call g_icon_equal#} (toIcon icon1) (toIcon icon2) @@ -83,31 +83,31 @@ -- | Generates a textual representation of icon that can be used for serialization such as when passing -- icon to a different process or saving it to persistent storage. Use 'iconNewForString' to get -- icon back from the returned string. --- +-- -- The encoding of the returned string is proprietary to 'Icon' except in the following two cases --- +-- -- * If icon is a 'FileIcon', the returned string is a native path (such as /path/to/my icon.png) -- without escaping if the 'File' for icon is a native file. If the file is not native, the returned -- string is the result of 'fileGetUri'. --- +-- -- * If icon is a 'ThemedIcon' with exactly one name, the encoding is simply the name (such as -- network-server). -iconToString :: IconClass icon => icon +iconToString :: IconClass icon => icon -> IO ByteString iconToString icon = do - sPtr <- {#call g_icon_to_string#} (toIcon icon) + sPtr <- {#call g_icon_to_string#} (toIcon icon) sLen <- lengthArray0 0 sPtr unsafePackCStringFinalizer (castPtr sPtr) (fromIntegral sLen) ({#call unsafe g_free#} (castPtr sPtr)) -- | Generate a 'Icon' instance from str. This function can fail if str is not valid - see -- 'iconToString' for discussion. --- +-- -- If your application or library provides one or more 'Icon' implementations you need to ensure that -- each GType is registered with the type system prior to calling 'iconNewForString'. iconNewForString :: ByteString -> IO Icon iconNewForString str = wrapNewGObject mkIcon $ - useAsCString str $ \ strPtr -> - propagateGError ({# call g_icon_new_for_string #} strPtr) + useAsCString str $ \ strPtr -> + propagateGError ({# call g_icon_new_for_string #} strPtr) #endif diff --git a/System/GIO/Signals.chs b/System/GIO/Signals.chs --- a/System/GIO/Signals.chs +++ b/System/GIO/Signals.chs @@ -46,7 +46,7 @@ connect_ENUM__NONE, connect_OBJECT__NONE, connect_MOBJECT_MOBJECT_ENUM__NONE, - + ) where import Control.Monad (liftM) @@ -67,7 +67,7 @@ -- the last one is the user g_pointer. Both are ignored. -connect_NONE__NONE :: +connect_NONE__NONE :: GObjectClass obj => SignalName -> ConnectAfter -> obj -> (IO ()) -> @@ -79,7 +79,7 @@ failOnGError $ user -connect_GLIBSTRING_GLIBSTRING_GLIBSTRING_ENUM__NONE :: +connect_GLIBSTRING_GLIBSTRING_GLIBSTRING_ENUM__NONE :: (Glib.GlibString a', Glib.GlibString b', Glib.GlibString c', Enum d, GObjectClass obj) => SignalName -> ConnectAfter -> obj -> (a' -> b' -> c' -> d -> IO ()) -> @@ -94,7 +94,7 @@ peekUTFString str1 >>= \str1' -> user str1' str2' str3' (toEnum enum4) -connect_OBJECT_OBJECT_ENUM__NONE :: +connect_OBJECT_OBJECT_ENUM__NONE :: (GObjectClass a', GObjectClass b', Enum c, GObjectClass obj) => SignalName -> ConnectAfter -> obj -> (a' -> b' -> c -> IO ()) -> @@ -108,7 +108,7 @@ makeNewGObject (GObject, objectUnref) (return obj1) >>= \obj1' -> user (unsafeCastGObject obj1') (unsafeCastGObject obj2') (toEnum enum3) -connect_ENUM__NONE :: +connect_ENUM__NONE :: (Enum a, GObjectClass obj) => SignalName -> ConnectAfter -> obj -> (a -> IO ()) -> @@ -120,7 +120,7 @@ failOnGError $ user (toEnum enum1) -connect_OBJECT__NONE :: +connect_OBJECT__NONE :: (GObjectClass a', GObjectClass obj) => SignalName -> ConnectAfter -> obj -> (a' -> IO ()) -> @@ -133,7 +133,7 @@ makeNewGObject (GObject, objectUnref) (return obj1) >>= \obj1' -> user (unsafeCastGObject obj1') -connect_MOBJECT_MOBJECT_ENUM__NONE :: +connect_MOBJECT_MOBJECT_ENUM__NONE :: (GObjectClass a', GObjectClass b', Enum c, GObjectClass obj) => SignalName -> ConnectAfter -> obj -> (Maybe a' -> Maybe b' -> c -> IO ()) -> diff --git a/System/GIO/Types.chs b/System/GIO/Types.chs --- a/System/GIO/Types.chs +++ b/System/GIO/Types.chs @@ -36,143 +36,143 @@ module System.GIO.Types ( OutputStream(OutputStream), OutputStreamClass, - toOutputStream, + toOutputStream, mkOutputStream, unOutputStream, castToOutputStream, gTypeOutputStream, FilterOutputStream(FilterOutputStream), FilterOutputStreamClass, - toFilterOutputStream, + toFilterOutputStream, mkFilterOutputStream, unFilterOutputStream, castToFilterOutputStream, gTypeFilterOutputStream, DataOutputStream(DataOutputStream), DataOutputStreamClass, - toDataOutputStream, + toDataOutputStream, mkDataOutputStream, unDataOutputStream, castToDataOutputStream, gTypeDataOutputStream, BufferedOutputStream(BufferedOutputStream), BufferedOutputStreamClass, - toBufferedOutputStream, + toBufferedOutputStream, mkBufferedOutputStream, unBufferedOutputStream, castToBufferedOutputStream, gTypeBufferedOutputStream, FileOutputStream(FileOutputStream), FileOutputStreamClass, - toFileOutputStream, + toFileOutputStream, mkFileOutputStream, unFileOutputStream, castToFileOutputStream, gTypeFileOutputStream, MemoryOutputStream(MemoryOutputStream), MemoryOutputStreamClass, - toMemoryOutputStream, + toMemoryOutputStream, mkMemoryOutputStream, unMemoryOutputStream, castToMemoryOutputStream, gTypeMemoryOutputStream, InputStream(InputStream), InputStreamClass, - toInputStream, + toInputStream, mkInputStream, unInputStream, castToInputStream, gTypeInputStream, MemoryInputStream(MemoryInputStream), MemoryInputStreamClass, - toMemoryInputStream, + toMemoryInputStream, mkMemoryInputStream, unMemoryInputStream, castToMemoryInputStream, gTypeMemoryInputStream, FilterInputStream(FilterInputStream), FilterInputStreamClass, - toFilterInputStream, + toFilterInputStream, mkFilterInputStream, unFilterInputStream, castToFilterInputStream, gTypeFilterInputStream, BufferedInputStream(BufferedInputStream), BufferedInputStreamClass, - toBufferedInputStream, + toBufferedInputStream, mkBufferedInputStream, unBufferedInputStream, castToBufferedInputStream, gTypeBufferedInputStream, DataInputStream(DataInputStream), DataInputStreamClass, - toDataInputStream, + toDataInputStream, mkDataInputStream, unDataInputStream, castToDataInputStream, gTypeDataInputStream, FileInputStream(FileInputStream), FileInputStreamClass, - toFileInputStream, + toFileInputStream, mkFileInputStream, unFileInputStream, castToFileInputStream, gTypeFileInputStream, FileMonitor(FileMonitor), FileMonitorClass, - toFileMonitor, + toFileMonitor, mkFileMonitor, unFileMonitor, castToFileMonitor, gTypeFileMonitor, Vfs(Vfs), VfsClass, - toVfs, + toVfs, mkVfs, unVfs, castToVfs, gTypeVfs, MountOperation(MountOperation), MountOperationClass, - toMountOperation, + toMountOperation, mkMountOperation, unMountOperation, castToMountOperation, gTypeMountOperation, ThemedIcon(ThemedIcon), ThemedIconClass, - toThemedIcon, + toThemedIcon, mkThemedIcon, unThemedIcon, castToThemedIcon, gTypeThemedIcon, Emblem(Emblem), EmblemClass, - toEmblem, + toEmblem, mkEmblem, unEmblem, castToEmblem, gTypeEmblem, EmblemedIcon(EmblemedIcon), EmblemedIconClass, - toEmblemedIcon, + toEmblemedIcon, mkEmblemedIcon, unEmblemedIcon, castToEmblemedIcon, gTypeEmblemedIcon, FileEnumerator(FileEnumerator), FileEnumeratorClass, - toFileEnumerator, + toFileEnumerator, mkFileEnumerator, unFileEnumerator, castToFileEnumerator, gTypeFileEnumerator, FilenameCompleter(FilenameCompleter), FilenameCompleterClass, - toFilenameCompleter, + toFilenameCompleter, mkFilenameCompleter, unFilenameCompleter, castToFilenameCompleter, gTypeFilenameCompleter, FileIcon(FileIcon), FileIconClass, - toFileIcon, + toFileIcon, mkFileIcon, unFileIcon, castToFileIcon, gTypeFileIcon, VolumeMonitor(VolumeMonitor), VolumeMonitorClass, - toVolumeMonitor, + toVolumeMonitor, mkVolumeMonitor, unVolumeMonitor, castToVolumeMonitor, gTypeVolumeMonitor, Cancellable(Cancellable), CancellableClass, - toCancellable, + toCancellable, mkCancellable, unCancellable, castToCancellable, gTypeCancellable, SimpleAsyncResult(SimpleAsyncResult), SimpleAsyncResultClass, - toSimpleAsyncResult, + toSimpleAsyncResult, mkSimpleAsyncResult, unSimpleAsyncResult, castToSimpleAsyncResult, gTypeSimpleAsyncResult, FileInfo(FileInfo), FileInfoClass, - toFileInfo, + toFileInfo, mkFileInfo, unFileInfo, castToFileInfo, gTypeFileInfo, AppLaunchContext(AppLaunchContext), AppLaunchContextClass, - toAppLaunchContext, + toAppLaunchContext, mkAppLaunchContext, unAppLaunchContext, castToAppLaunchContext, gTypeAppLaunchContext, Icon(Icon), IconClass, - toIcon, + toIcon, mkIcon, unIcon, castToIcon, gTypeIcon, Seekable(Seekable), SeekableClass, - toSeekable, + toSeekable, mkSeekable, unSeekable, castToSeekable, gTypeSeekable, AppInfo(AppInfo), AppInfoClass, - toAppInfo, + toAppInfo, mkAppInfo, unAppInfo, castToAppInfo, gTypeAppInfo, Volume(Volume), VolumeClass, - toVolume, + toVolume, mkVolume, unVolume, castToVolume, gTypeVolume, AsyncResult(AsyncResult), AsyncResultClass, - toAsyncResult, + toAsyncResult, mkAsyncResult, unAsyncResult, castToAsyncResult, gTypeAsyncResult, LoadableIcon(LoadableIcon), LoadableIconClass, - toLoadableIcon, + toLoadableIcon, mkLoadableIcon, unLoadableIcon, castToLoadableIcon, gTypeLoadableIcon, Drive(Drive), DriveClass, - toDrive, + toDrive, mkDrive, unDrive, castToDrive, gTypeDrive, File(File), FileClass, - toFile, + toFile, mkFile, unFile, castToFile, gTypeFile, Mount(Mount), MountClass, - toMount, + toMount, mkMount, unMount, castToMount, gTypeMount ) where diff --git a/gio.cabal b/gio.cabal --- a/gio.cabal +++ b/gio.cabal @@ -1,5 +1,5 @@ Name: gio -Version: 0.13.0.2 +Version: 0.13.0.3 License: LGPL-2.1 License-file: COPYING Copyright: (c) 2001-2010 The Gtk2Hs Team @@ -42,7 +42,7 @@ Library build-depends: base >= 4 && < 5, array, containers, mtl, bytestring, glib >= 0.13.0.0 && < 0.14 - build-tools: gtk2hsC2hs >= 0.13.11, + build-tools: gtk2hsC2hs >= 0.13.12, gtk2hsHookGenerator, gtk2hsTypeGen exposed-modules: