glibmm r627 - in trunk: . gio/src

[murrayc svn gnome org]

Author: murrayc
Date: Wed Feb 27 17:25:57 2008
New Revision: 627
URL: http://svn.gnome.org/viewvc/glibmm?rev=627&view=rev

Log:
2008-02-27  Murray Cumming  <murrayc murrayc com>

* gio/src/asyncresult.hg:
* gio/src/file.hg:
* gio/src/fileenumerator.hg:
* gio/src/fileinputstream.hg:
* gio/src/fileoutputstream.hg:
* gio/src/gio_docs_override.xml:
* gio/src/inputstream.hg:
* gio/src/outputstream.hg: Correct hand-coded documentation, 
to talk about throwing exceptions rather than setting or returning 
errors.
* gio/src/mount.hg: Add class documentation based on the C documentation.

Modified:
   trunk/ChangeLog
   trunk/gio/src/asyncresult.hg
   trunk/gio/src/bufferedinputstream.hg
   trunk/gio/src/drive.hg
   trunk/gio/src/file.hg
   trunk/gio/src/fileenumerator.hg
   trunk/gio/src/fileinputstream.hg
   trunk/gio/src/filemonitor.hg
   trunk/gio/src/fileoutputstream.hg
   trunk/gio/src/gio_docs_override.xml
   trunk/gio/src/inputstream.hg
   trunk/gio/src/loadableicon.hg
   trunk/gio/src/mount.hg
   trunk/gio/src/outputstream.hg
   trunk/gio/src/seekable.hg
   trunk/gio/src/volume.hg

Modified: trunk/gio/src/asyncresult.hg
==============================================================================
--- trunk/gio/src/asyncresult.hg	(original)
+++ trunk/gio/src/asyncresult.hg	Wed Feb 27 17:25:57 2008
@@ -49,8 +49,7 @@
  * To begin an asynchronous operation, provide a SlotAsyncReady to the asynchronous function. This callback will be triggered 
  * when the operation has completed, and will be passed an AsyncResult instance filled with the details of the operation's success or 
  * failure, the object the asynchronous function was started for and any error codes returned. The asynchronous callback function is then 
- * expected to call the corresponding "_finish()" function with the object the function was called for, and the AsyncResult instance, 
- * and optionally, an error to grab any error conditions that may have occurred.
+ * expected to call the corresponding "_finish()" function with the object the function was called for, and the AsyncResult instance.
  *
  * The purpose of the "_finish()" function is to take the generic result of type AsyncResult and return the specific result that the operation 
  * in question yields (e.g. a FileEnumerator for an "enumerate children" operation). If the result or error status of the operation is not needed, 

Modified: trunk/gio/src/bufferedinputstream.hg
==============================================================================
--- trunk/gio/src/bufferedinputstream.hg	(original)
+++ trunk/gio/src/bufferedinputstream.hg	Wed Feb 27 17:25:57 2008
@@ -94,7 +94,7 @@
 protected:
 #m4 _CONVERSION(`GCancellable*', `const Glib::RefPtr<Cancellable>&', `Glib::wrap($3, true)')
   //_WRAP_VFUNC(gssize fill(gssize count, const Glib::RefPtr<Cancellable>& cancellable, GError** error), "fill")
-  // TODO: wrap async vfuncs
+
 };
 
 } // namespace Gio

Modified: trunk/gio/src/drive.hg
==============================================================================
--- trunk/gio/src/drive.hg	(original)
+++ trunk/gio/src/drive.hg	Wed Feb 27 17:25:57 2008
@@ -113,9 +113,8 @@
   _WRAP_METHOD(Glib::StringArrayHandle enumerate_identifiers() const, g_drive_enumerate_identifiers)
 
   //_WRAP_VFUNC(Glib::ustring get_name() const, get_name)
-  //TODO: Careful of ref-counting: //_WRAP_VFUNC(Glib::RefPtr<Icon> get_icon() const, get_icon)
+  //Careful of ref-counting: //_WRAP_VFUNC(Glib::RefPtr<Icon> get_icon() const, get_icon)
   //_WRAP_VFUNC(bool has_volumes() const, has_volumes)
-  //TODO: finish
 };
 
 } // namespace Gio

Modified: trunk/gio/src/file.hg
==============================================================================
--- trunk/gio/src/file.hg	(original)
+++ trunk/gio/src/file.hg	Wed Feb 27 17:25:57 2008
@@ -177,8 +177,8 @@
   /** Opens a file for reading. The result is a FileInputStream that
    * can be used to read the contents of the file.
    * 
-   * If the file does not exist, the IO_ERROR_NOT_FOUND error will be returned.
-   * If the file is a directory, theIO_ERROR_IS_DIRECTORY error will be returned.
+   * If the file does not exist, a Gio::Error with NOT_FOUND will be thrown.
+   * If the file is a directory, a Gio::Error with IS_DIRECTORY will be thrown.
    * Other errors are possible too, and depend on what kind of filesystem the file is on.
    * @return FileInputStream or an empty RefPtr on error.
    */
@@ -223,12 +223,12 @@
    * 
    * The operation can be cancelled by
    * triggering the cancellable object from another thread. If the operation
-   * was cancelled, the error IO_ERROR_CANCELLED will be returned. 
+   * was cancelled, a Gio::Error with CANCELLED will be thrown. 
    * 
    * Some filesystems don't allow all filenames, and may
-   * return an G_IO_ERROR_INVALID_FILENAME error.
-   * If the file is a directory the G_IO_ERROR_IS_DIRECTORY error will be
-   * returned. Other errors are possible too, and depend on what kind of
+   * throw a Gio::Error with INVALID_FILENAME.
+   * If the file is a directory a Gio::Error with IS_DIRECTORY will be
+   * thrown. Other errors are possible too, and depend on what kind of
    * filesystem the file is on.
    * @param flags A set of FileCreateFlags.
    * @param cancellable Optional Cancellable object.
@@ -249,9 +249,9 @@
    * is supported on the target filesystem.
    * 
    * Some filesystems don't allow all filenames, and may
-   * return an G_IO_ERROR_INVALID_FILENAME error.
-   * If the file is a directory the G_IO_ERROR_IS_DIRECTORY error will be
-   * returned. Other errors are possible too, and depend on what kind of
+   * throw a Gio::Error with INVALID_FILENAME.
+   * If the file is a directory a Gio::Error with IS_DIRECTORY will be 
+   * thrown. Other errors are possible too, and depend on what kind of
    * filesystem the file is on.
    * @param flags A set of FileCreateFlags.
    * @return A FileOutputStream.
@@ -275,14 +275,15 @@
    * is supported on the target filesystem.
    * 
    * The operation can be cancelled by triggering the cancellable object from another thread. 
-   * If the operation was cancelled, the error IO_ERROR_CANCELLED will be returned.
+   * If the operation was cancelled, a Gio::Error with CANCELLED will be thrown.
    * 
-   * If a file with this name already exists the IO_ERROR_EXISTS error
-   * will be returned. If the file is a directory the G_IO_ERROR_IS_DIRECTORY
-   * error will be returned.
+   * If a file with this name already exists a Gio::Error with EXISTS 
+   * will be thrown. If the file is a directory a Gio::Error with IS_DIRECTORY
+   * will be thrown.
+   *
    * Some filesystems don't allow all filenames, and may
-   * return an IO_ERROR_INVALID_FILENAME error, and if the name
-   * is to long IO_ERROR_FILENAME_TOO_LONG will be returned.
+   * throw a Gio::Error with INVALID_FILENAME, and if the name
+   * is to longa Gio::Error with FILENAME_TOO_LONG will be thrown.
    * Other errors are possible too, and depend on what kind of
    * filesystem the file is on.
    *
@@ -305,12 +306,13 @@
    * will be made readable only to the current user, to the level that
    * is supported on the target filesystem.
    * 
-   * If a file with this name already exists the IO_ERROR_EXISTS error
-   * will be returned. If the file is a directory the G_IO_ERROR_IS_DIRECTORY
-   * error will be returned.
+   * If a file with this name already exists a Gio::Error with EXISTS 
+   * will be thrown. If the file is a directory a Gio::Error with IS_DIRECTORY
+   * will be thrown.
+   *
    * Some filesystems don't allow all filenames, and may
-   * return an IO_ERROR_INVALID_FILENAME error, and if the name
-   * is to long IO_ERROR_FILENAME_TOO_LONG will be returned.
+   * throw a Gio::Error with INVALID_FILENAME, and if the name
+   * is to longa Gio::Error with FILENAME_TOO_LONG will be thrown.
    * Other errors are possible too, and depend on what kind of
    * filesystem the file is on.
    *
@@ -326,8 +328,6 @@
   _IGNORE(g_file_create)
 
 
-  //TODO: Rephrase this documentation in terms of _throwing_ exceptions instead of returning errors. And what exception is thrown?
-
   /** Returns an output stream for overwriting the file, possibly creating a backup copy of the file first.
    * This will try to replace the file in the safest way possible so that any errors during the writing will 
    * not affect an already existing copy of the file. For instance, for local files it may write to a 
@@ -338,22 +338,22 @@
    * target filesystem.
    *
    * The operation can be cancelled by triggering the cancellable object from another thread. 
-   * If the operation was cancelled, the error IO_ERROR_CANCELLED will be returned.
+   * If the operation was cancelled, a Gio::Error with CANCELLED will be thrown.
    *
    * If you pass in an etag value, then this value is compared to the current entity tag of the file, 
-   * and if they differ an IO_ERROR_WRONG_ETAG error is returned. This generally means that the file has 
+   * and if they differ a Gio::Error with WRONG_ETAG will be thrown. This generally means that the file has 
    * been changed since you last read it. You can get the new etag from FileOutputStream::get_etag() 
    * after you've finished writing and closed the FileOutputStream. When you load a new file you can 
    * use FileInputStream::query_info() to get the etag of the file.
    *
    * If @a make_backup is true, this function will attempt to make a backup of the current file before 
-   * overwriting it. If this fails a IO_ERROR_CANT_CREATE_BACKUP error will be returned. If you want to replace 
+   * overwriting it. If this fails aa Gio::Error with CANT_CREATE_BACKUP will be thrown. If you want to replace 
    * anyway, try again with @a make_backup set to false.
    *
-   * If the file is a directory the IO_ERROR_IS_DIRECTORY error will be returned, and if the file is some 
-   * other form of non-regular file then a IO_ERROR_NOT_REGULAR_FILE error will be returned. Some file 
-   * systems don't allow all file names, and may return an IO_ERROR_INVALID_FILENAME error, and if the 
-   * name is to long IO_ERROR_FILENAME_TOO_LONG will be returned. Other errors are possible too, and 
+   * If the file is a directory a Gio::Error with IS_DIRECTORY will be thrown, and if the file is some 
+   * other form of non-regular file then aa Gio::Error with NOT_REGULAR_FILE will be thrown. Some file 
+   * systems don't allow all file names, and may throw a Gio::Error with INVALID_FILENAME, and if the 
+   * name is to longa Gio::Error with FILENAME_TOO_LONG will be thrown. Other errors are possible too, and 
    * depend on what kind of filesystem the file is on.
    * 
    * @param etag An optional entity tag for the current Glib::File.
@@ -378,19 +378,19 @@
    * target filesystem.
    *
    * If you pass in an etag value, then this value is compared to the current entity tag of the file, 
-   * and if they differ an IO_ERROR_WRONG_ETAG error is returned. This generally means that the file has 
+   * and if they differ a Gio::Error with WRONG_ETAG will be thrown. This generally means that the file has 
    * been changed since you last read it. You can get the new etag from FileOutputStream::get_etag() 
    * after you've finished writing and closed the FileOutputStream. When you load a new file you can 
    * use FileInputStream::query_info() to get the etag of the file.
    *
    * If @a make_backup is true, this function will attempt to make a backup of the current file before 
-   * overwriting it. If this fails a IO_ERROR_CANT_CREATE_BACKUP error will be returned. If you want to replace 
+   * overwriting it. If this fails aa Gio::Error with CANT_CREATE_BACKUP will be thrown. If you want to replace 
    * anyway, try again with @a make_backup set to false.
    *
-   * If the file is a directory the IO_ERROR_IS_DIRECTORY error will be returned, and if the file is some 
-   * other form of non-regular file then a IO_ERROR_NOT_REGULAR_FILE error will be returned. Some file 
-   * systems don't allow all file names, and may return an IO_ERROR_INVALID_FILENAME error, and if the 
-   * name is to long IO_ERROR_FILENAME_TOO_LONG will be returned. Other errors are possible too, and 
+   * If the file is a directory a Gio::Error with IS_DIRECTORY will be thrown, and if the file is some 
+   * other form of non-regular file then aa Gio::Error with NOT_REGULAR_FILE will be thrown. Some file 
+   * systems don't allow all file names, and may throw a Gio::Error with INVALID_FILENAME, and if the 
+   * name is to longa Gio::Error with FILENAME_TOO_LONG will be thrown. Other errors are possible too, and 
    * depend on what kind of filesystem the file is on.
    * 
    * @param etag An optional entity tag for the current Glib::File.
@@ -509,7 +509,7 @@
    * 
    * The operation can be cancelled by
    * triggering the cancellable object from another thread. If the operation
-   * was cancelled, the error IO_ERROR_CANCELLED will be returned. 
+   * was cancelled, a Gio::Error with CANCELLED will be thrown. 
    *
    * For symlinks, normally the information about the target of the
    * symlink is returned, rather than information about the symlink itself.
@@ -518,7 +518,7 @@
    * that point to non-existing files the information about the symlink itself
    * will be returned.
    *
-   * If the file does not exist, the IO_ERROR_NOT_FOUND error will be returned.
+   * If the file does not exist, a Gio::Error with NOT_FOUND will be thrown.
    * Other errors are possible too, and depend on what kind of filesystem the file is on.
    *
    * @param cancellable A Cancellable object.
@@ -551,7 +551,7 @@
    * that point to non-existing files the information about the symlink itself
    * will be returned.
    *
-   * If the file does not exist, the IO_ERROR_NOT_FOUND error will be returned.
+   * If the file does not exist, a Gio::Error with NOT_FOUND will be thrown.
    * Other errors are possible too, and depend on what kind of filesystem the file is on.
    *
    * @param attributes: An attribute query string.
@@ -584,7 +584,7 @@
    * can both result in two processes creating the file (with perhaps a partially
    * written file as the result). The correct approach is to always try to create
    * the file with g_file_create() which will either atomically create the file
-   * or fail with an IO_ERROR_EXISTS error.
+   * or throw a Gio::Error with EXISTS.
    *
    * However, in many cases an existance check is useful in a user
    * interface, for instance to make a menu item sensitive/insensitive, so that
@@ -645,9 +645,9 @@
    * 
    * If @a cancellable  is not <tt>0</tt>, then the operation can be cancelled by
    * triggering the cancellable object from another thread. If the operation
-   * was cancelled, the error IO_ERROR_CANCELLED will be returned. 
+   * was cancelled, a Gio::Error with CANCELLED will be thrown. 
    * 
-   * If the file does not exist, the G_IO_ERROR_NOT_FOUND error will be returned.
+   * If the file does not exist, a Gio::Error with NOT_FOUND will be thrown.
    * Other errors are possible too, and depend on what kind of filesystem the file is on.
    * @param cancellable A Cancellable object.
    * @param attributes An attribute query string.
@@ -675,7 +675,7 @@
    * bytes availible), and FILE_ATTRIBUTE_FILESYSTEM_TYPE (type of the filesystem).
    * 
    * 
-   * If the file does not exist, the G_IO_ERROR_NOT_FOUND error will be returned.
+   * If the file does not exist, a Gio::Error with NOT_FOUND will be thrown.
    * Other errors are possible too, and depend on what kind of filesystem the file is on.
    * @param attributes An attribute query string.
    * @return A FileInfo or an empty RefPtr if there was an error.
@@ -732,7 +732,7 @@
   /** Gets a Mount for the File. 
    * 
    * If the FileIface for the file does not have a mount (e.g. possibly a 
-   * remote share), an error will be set to IO_ERROR_NOT_FOUND and an empty RefPtr 
+   * remote share), an Gio::Error wtih NOT_FOUND will be thrown and an empty RefPtr 
    * will be returned.
    *
    * @param cancellable Cancellable object.
@@ -791,10 +791,10 @@
    * 
    * The operation can be cancelled by
    * triggering the cancellable object from another thread. If the operation
-   * was cancelled, the error IO_ERROR_CANCELLED will be returned. 
+   * was cancelled, a Gio::Error with CANCELLED will be thrown. 
    * 
-   * If the file does not exist, the G_IO_ERROR_NOT_FOUND error will be returned.
-   * If the file is not a directory, the G_FILE_ERROR_NOTDIR error will be returned.
+   * If the file does not exist, a Gio::Error with NOT_FOUND will be thrown.
+   * If the file is not a directory, a Glib::FileError with NOTDIR will be thrown.
    * Other errors are possible too.
    *
    * @param cancellable A Cancellable object.
@@ -821,8 +821,8 @@
    * namespace. An example attribute query be "standard::*,owner::user".
    * The standard attributes are availible as defines, like FILE_ATTRIBUTE_STANDARD_NAME.
    * 
-   * If the file does not exist, the G_IO_ERROR_NOT_FOUND error will be returned.
-   * If the file is not a directory, the G_FILE_ERROR_NOTDIR error will be returned.
+   * If the file does not exist, a Gio::Error with NOT_FOUND will be thrown.
+   * If the file is not a directory, a Glib::FileError with NOTDIR will be thrown.
    * Other errors are possible too.
    *
    * @param attributes An attribute query string.
@@ -884,7 +884,7 @@
    * On success the resulting converted filename is returned.
    * 
    * The operation can be cancelled by triggering the cancellable object from another thread. If the operation
-   * was cancelled, the error IO_ERROR_CANCELLED will be returned.
+   * was cancelled, a Gio::Error with CANCELLED will be thrown.
    *
    * @param display_name A string.
    * @return A Glib::File specifying what the file was renamed to, or an empty RefPtr if there was an error.
@@ -941,8 +941,8 @@
 
   /** Sends the file to the "Trashcan", if possible. This is similar to
    * deleting it, but the user can recover it before emptying the trashcan.
-   * Not all filesystems support trashing, so this call can return the
-   * IO_ERROR_NOT_SUPPORTED error.
+   * Not all filesystems support trashing, so this call can throw a Gio::Error
+   * with NOT_SUPPORTED.
    *
    * @return <tt>true</tt> on successful trash, <tt>false</tt> otherwise.
    */
@@ -958,24 +958,23 @@
    */
   typedef sigc::slot<void, goffset, goffset> SlotFileProgress;
 
-  //TODO: Rephrase this in terms of exceptions rather than errors. And what exceptions are thrown?
   /** Copies the file source to the location specified by destination. Can not handle recursive copies of directories.
    * If the flag FILE_COPY_OVERWRITE is specified an already existing destination file is overwritten.
    * If the flag FILE_COPY_NOFOLLOW_SYMLINKS is specified then symlinks will be copied as symlinks, otherwise the target of the source symlink will be copied.
    *
-   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, the error IO_ERROR_CANCELLED will be returned.
+   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, a Gio::Error with CANCELLED will be thrown.
    *
    * The operation can be monitored via the @a slot callback.
    *
-   * If the source file does not exist then the IO_ERROR_NOT_FOUND error is returned, independent on the status of the destination.
+   * If the source file does not exist then a Gio::Error with NOT_FOUND will be thrown, independent on the status of the destination.
    *
-   * If FILE_COPY_OVERWRITE is not specified and the target exists, then the error IO_ERROR_EXISTS is returned.
+   * If FILE_COPY_OVERWRITE is not specified and the target exists, then a Gio::Error with EXISTS will be thrown.
    *
-   * If trying to overwrite a file over a directory the IO_ERROR_IS_DIRECTORY error is returned. 
-   * If trying to overwrite a directory with a directory the IO_ERROR_WOULD_MERGE error is returned.
+   * If trying to overwrite a file over a directory a Gio::Error with IS_DIRECTORY will be thrown. 
+   * If trying to overwrite a directory with a directory a Gio::Error with WOULD_MERGE will be thrown.
    *
    * If the source is a directory and the target does not exist, or FILE_COPY_OVERWRITE is specified and the target is a file, 
-   * then the IO_ERROR_WOULD_RECURSE error is returned.
+   * then a Gio::Error with WOULD_RECURSE will be thrown.
    *
    * If you are interested in copying the Gio::File object itself (not the on-disk file), see File::dup().
    */
@@ -1068,7 +1067,6 @@
                g_file_copy_finish,
                errthrow)
 
-  //TODO: Rephrase this in terms of exceptions rather than errors. And what exceptions are thrown?
   /** Tries to move the file or directory source to the location specified by destination. If native move operations are supported then this is 
    * used, otherwise a copy and delete fallback is used. The native implementation may support moving directories (for instance on moves inside 
    * the same filesystem), but the fallback code does not.
@@ -1077,17 +1075,17 @@
    * 
    * If the flag FILE_COPY_NOFOLLOW_SYMLINKS is specified then symlinks will be copied as symlinks, otherwise the target of the source symlink will be copied.
    * 
-   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, the error IO_ERROR_CANCELLED will be returned.
+   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, a Gio::Error with CANCELLED will be thrown.
    *
    * The operation can be monitored via the @a slot callback.
-   * If the source file does not exist then the IO_ERROR_NOT_FOUND error is returned, independent on the status of the destination.
+   * If the source file does not exist then a Gio::Error with NOT_FOUND will be thrown, independent on the status of the destination.
    * 
-   * If G_FILE_COPY_OVERWRITE is not specified and the target exists, then the error G_IO_ERROR_EXISTS is returned.
+   * If G_FILE_COPY_OVERWRITE is not specified and the target exists, then a Gio::Error with EXISTS will be thrown.
    * 
-   * If trying to overwrite a file over a directory the IO_ERROR_IS_DIRECTORY error is returned. 
-   * If trying to overwrite a directory with a directory the IO_ERROR_WOULD_MERGE error is returned.
+   * If trying to overwrite a file over a directory a Gio::Error with IS_DIRECTORY will be thrown. 
+   * If trying to overwrite a directory with a directory a Gio::Error with WOULD_MERGE will be thrown.
    * 
-   * If the source is a directory and the target does not exist, or FILE_COPY_OVERWRITE is specified and the target is a file, then the IO_ERROR_WOULD_RECURSE error may be returned (if the native move operation isn't available).
+   * If the source is a directory and the target does not exist, or FILE_COPY_OVERWRITE is specified and the target is a file, then a Gio::Error with WOULD_RECURSE may be thrown (if the native move operation isn't available).
    */
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   bool move(const Glib::RefPtr<File>& destination, const SlotFileProgress& slot, const Glib::RefPtr<Cancellable>& cancellable, FileCopyFlags flags = FILE_COPY_NONE);
@@ -1183,14 +1181,14 @@
   /** Tries to set all attributes in the FileInfo on the target values, 
    * not stopping on the first error.
    * 
-   * If there is any error during this operation then a error will be set to
-   * the first error. Error on particular fields are flagged by setting 
+   * If there is any error during this operation then a Gio::Error will be thrown.
+   * Error on particular fields are flagged by setting 
    * the "status" field in the attribute value to 
    * FILE_ATTRIBUTE_STATUS_ERROR_SETTING, which means you can also detect
    * further errors.
    * 
-   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, the error 
-   * IO_ERROR_CANCELLED will be returned.
+   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled,  
+   * a Gio::Error with CANCELLED will be thrown.
    *
    * @param info A FileInfo.
    * @param cancellable A Cancellable object which can be used to cancel the operation.
@@ -1206,14 +1204,14 @@
   /** Tries to set all attributes in the FileInfo on the target values, 
    * not stopping on the first error.
    * 
-   * If there is any error during this operation then a error will be set to
-   * the first error. Error on particular fields are flagged by setting 
+   * If there is any error during this operation then a Gio::Error will be thrown.
+   * Error on particular fields are flagged by setting 
    * the "status" field in the attribute value to 
    * FILE_ATTRIBUTE_STATUS_ERROR_SETTING, which means you can also detect
    * further errors.
    * 
-   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, the error 
-   * IO_ERROR_CANCELLED will be returned.
+   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, 
+   * a Gio::Error with CANCELLED will be thrown.
    *
    * @param info A FileInfo.
    * @param flags A set of FileQueryInfoFlags.
@@ -1378,8 +1376,8 @@
    * When this operation has completed, @a slot will be called with, 
    * and the operation can be finalized with mount_enclosing_volume_finish().
    * 
-   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, the error 
-   * IO_ERROR_CANCELLED will be returned.
+   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, 
+   * a Gio::Error with CANCELLED will be thrown.
    *
    * @param mount_operation A MountOperation.
    * @param slot A callback slot which will be called when the request is satisfied.
@@ -1420,8 +1418,8 @@
   /** Mounts a file of type FILE_TYPE_MOUNTABLE. Using @a mount_operation, you can request callbacks when, for instance, 
    * passwords are needed during authentication.
    *
-   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, the error 
-   * IO_ERROR_CANCELLED will be returned.
+   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, 
+   * a Gio::Error with CANCELLED will be thrown.
    *
    * When the operation is finished, @a slot will be called. You can then call mount_mountable_finish() to get the result of the operation.
    *
@@ -1460,8 +1458,8 @@
 
   /** Unmounts a file of type FILE_TYPE_MOUNTABLE.
    *
-   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, the error 
-   * IO_ERROR_CANCELLED will be returned.
+   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, 
+   * a Gio::Error with CANCELLED will be thrown.
    *
    * When the operation is finished, @a slot will be called. You can then call unmount_mountable_finish() to get the result of the operation.
    *
@@ -1493,8 +1491,8 @@
 
   /** Starts an asynchronous eject on a mountable.
    *
-   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, the error 
-   * IO_ERROR_CANCELLED will be returned.
+   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, 
+   * a Gio::Error with CANCELLED will be thrown.
    *
    * When the operation is finished, @a slot will be called. You can then call eject_mountable_finish() to get the result of the operation.
    *
@@ -1566,7 +1564,7 @@
    * This may fail if directory monitoring is not supported.
    * 
    * The operation can be cancelled by triggering the cancellable object from another thread. If the operation
-   * was cancelled, the error IO_ERROR_CANCELLED will be returned.
+   * was cancelled, a Gio::Error with CANCELLED will be thrown.
    *
    * @param cancellable A Cancellable object.
    * @param flags A set of FileMonitorFlags.
@@ -1597,7 +1595,7 @@
    * mechanism exists, then regular polling of the file is used.
    * 
    * The operation can be cancelled by triggering the cancellable object from another thread. If the operation
-   * was cancelled, the error IO_ERROR_CANCELLED will be returned.
+   * was cancelled, a Gio::Error with CANCELLED will be thrown.
    *
    * @param flags A set of FileMonitorFlags.
    * @param A Cancellable object.
@@ -1613,7 +1611,7 @@
    * mechanism exists, then regular polling of the file is used.
    * 
    * The operation can be cancelled by triggering the cancellable object from another thread. If the operation
-   * was cancelled, the error IO_ERROR_CANCELLED will be returned.
+   * was cancelled, a Gio::Error with CANCELLED will be thrown.
    *
    * @param flags A set of FileMonitorFlags.
    * @param A Cancellable object.
@@ -1656,7 +1654,7 @@
    * call load_contents_finish() with the AsyncResult provided to the @a slot.
    *
    * The operation can be cancelled by triggering the cancellable object from another thread. 
-   * If the operation was cancelled, the error IO_ERROR_CANCELLED will be returned.
+   * If the operation was cancelled, a Gio::Error with CANCELLED will be thrown.
    *
    * @param slot A callback slot which will be called when the request is satisfied.
    * @param cancellable A Cancellable object.
@@ -1690,8 +1688,8 @@
   /** Reads the partial contents of a file.
    * The @a slot_read_more callback slot should be used to stop reading from the file when appropriate. This operation can be finished by load_partial_contents_finish().
    *
-   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, the error 
-   * IO_ERROR_CANCELLED will be returned.
+   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, 
+   * a Gio::Error with CANCELLED will be thrown.
    *
    * When the operation is finished, @a slot will be called. You can then call load_partial_contents_finish() to get the result of the operation.
    *
@@ -1704,8 +1702,8 @@
   /** Reads the partial contents of a file.
    * The @a slot_read_more callback slot should be used to stop reading from the file when appropriate. This operation can be finished by load_partial_contents_finish().
    *
-   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, the error 
-   * IO_ERROR_CANCELLED will be returned.
+   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, 
+   * a Gio::Error with CANCELLED will be thrown.
    *
    * When the operation is finished, @a slot will be called. You can then call load_partial_contents_finish() to get the result of the operation.
    *
@@ -1725,13 +1723,13 @@
   /** Replaces the contents of the file with @a contents of @a length bytes.
    *  
    * If @a etag is specified (not <tt>0</tt>) any existing file must have that etag, or
-   * the error IO_ERROR_WRONG_ETAG will be returned.
+   * a Gio::Error with WRONG_ETAG will be thrown.
    * 
    * If @a make_backup is <tt>true</tt>, this function will attempt to make a backup of the file.
    * 
    * The operation can be cancelled by
    * triggering the cancellable object from another thread. If the operation
-   * was cancelled, the error IO_ERROR_CANCELLED will be returned. 
+   * was cancelled, a Gio::Error with CANCELLED will be thrown. 
    * 
    * The returned @a new_etag  can be used to verify that the file hasn't changed the
    * next time it is saved over.
@@ -1754,7 +1752,7 @@
   /** Replaces the contents of the file with @a contents of @a length bytes.
    *  
    * If @a etag is specified (not <tt>0</tt>) any existing file must have that etag, or
-   * the error IO_ERROR_WRONG_ETAG will be returned.
+   * a Gio::Error with WRONG_ETAG will be thrown.
    * 
    * If @a make_backup is <tt>true</tt>, this function will attempt to make a backup of the file.
    * 
@@ -1778,13 +1776,13 @@
   /** Replaces the contents of the file with @a contents.
    *  
    * If @a etag is specified (not <tt>0</tt>) any existing file must have that etag, or
-   * the error IO_ERROR_WRONG_ETAG will be returned.
+   * a Gio::Error with WRONG_ETAG will be thrown.
    * 
    * If @a make_backup is <tt>true</tt>, this function will attempt to make a backup of the file.
    * 
    * The operation can be cancelled by
    * triggering the cancellable object from another thread. If the operation
-   * was cancelled, the error IO_ERROR_CANCELLED will be returned. 
+   * was cancelled, a Gio::Error with CANCELLED will be thrown. 
    * 
    * The returned @a new_etag  can be used to verify that the file hasn't changed the
    * next time it is saved over.
@@ -1806,7 +1804,7 @@
   /** Replaces the contents of the file with @a contents.
    *  
    * If @a etag is specified (not <tt>0</tt>) any existing file must have that etag, or
-   * the error IO_ERROR_WRONG_ETAG will be returned.
+   * a Gio::Error with WRONG_ETAG will be thrown.
    * 
    * If @a make_backup is <tt>true</tt>, this function will attempt to make a backup of the file.
    * 
@@ -1837,7 +1835,7 @@
   * 
   * The operation can be cancelled by
   * triggering the cancellable object from another thread. If the operation
-  * was cancelled, the error IO_ERROR_CANCELLED will be returned. 
+  * was cancelled, a Gio::Error with CANCELLED will be thrown. 
   * 
   * If @a make_backup is true, this function will attempt to 
   * make a backup of the file.
@@ -1880,7 +1878,7 @@
   * 
   * The operation can be cancelled by
   * triggering the cancellable object from another thread. If the operation
-  * was cancelled, the error IO_ERROR_CANCELLED will be returned. 
+  * was cancelled, a Gio::Error with CANCELLED will be thrown. 
   * 
   * If @a make_backup is true, this function will attempt to 
   * make a backup of the file.
@@ -1903,7 +1901,7 @@
   * 
   * The operation can be cancelled by
   * triggering the cancellable object from another thread. If the operation
-  * was cancelled, the error IO_ERROR_CANCELLED will be returned. 
+  * was cancelled, a Gio::Error with CANCELLED will be thrown. 
   * 
   * If @a make_backup is true, this function will attempt to 
   * make a backup of the file.
@@ -1955,12 +1953,12 @@
   //_WRAP_VFUNC(std::string get_uri() const, "get_uri")
   //_WRAP_VFUNC(std::string get_parse_name() const, "get_parse_name")
 
-  //TODO: Careful of refcounting: //_WRAP_VFUNC(Glib::RefPtr<File> get_parent() const, "get_parent")
+  //Careful of refcounting: //_WRAP_VFUNC(Glib::RefPtr<File> get_parent() const, "get_parent")
 
-  // TODO: GFileIface does not define get_child(). Perhaps it's not intentional.
+  // GFileIface does not define get_child(). Perhaps it's not intentional.
   //  //_WRAP_VFUNC(Glib::RefPtr<File> get_child(const std::string& name) const, "get_child")
 
-  // TODO: howto wrap a vfunc that takes a GError**
+  // howto wrap a vfunc that takes a GError**
 //   //_WRAP_VFUNC(Glib::RefPtr<File> get_child_for_display_name(const Glib::ustring& display_name) const,
 //               "get_child_for_display_name",
 //               errthrow)
@@ -1971,7 +1969,7 @@
 
   //_WRAP_VFUNC(std::string get_relative_path(const Glib::RefPtr<const File>& descendant) const, "get_relative_path")
 
-  //TODO: Careful of refcounting:   //_WRAP_VFUNC(Glib::RefPtr<const File> resolve_relative_path(const std::string& relative_path) const, "resolve_relative_path")
+  //Careful of refcounting:   //_WRAP_VFUNC(Glib::RefPtr<const File> resolve_relative_path(const std::string& relative_path) const, "resolve_relative_path")
 
   //_WRAP_VFUNC(bool is_native() const, "is_native")
   //_WRAP_VFUNC(bool has_uri_scheme(const std::string& uri_scheme) const, "has_uri_scheme")

Modified: trunk/gio/src/fileenumerator.hg
==============================================================================
--- trunk/gio/src/fileenumerator.hg	(original)
+++ trunk/gio/src/fileenumerator.hg	Wed Feb 27 17:25:57 2008
@@ -68,7 +68,7 @@
                errthrow)
 
   /** Releases all resources used by this enumerator, making the
-   * enumerator return IO_ERROR_CLOSED on all calls.
+   * enumerator throw a Gio::Error with CLOSED on all calls.
    * 
    * This will be automatically called when the last reference
    * is dropped, but you might want to call this method to make sure resources
@@ -130,7 +130,7 @@
    * See close(), which is the synchronous version of this function.
    *
    * The operation can be cancelled by triggering the cancellable object from another thread. 
-   * If the operation was cancelled, the error ERROR_CANCELLED will be returned in close_finish().
+   * If the operation was cancelled, a Gio::Error with CANCELLED will be thrown by close_finish().
    *
    * @param io_priority The I/O priority of the request.
    * @param cancellable A Cancellable object which can be used to cancel the operation.
@@ -155,8 +155,6 @@
   _WRAP_METHOD(bool is_closed() const, g_file_enumerator_is_closed)
   _WRAP_METHOD(bool has_pending() const, g_file_enumerator_has_pending)
   _WRAP_METHOD(void set_pending(bool pending = true), g_file_enumerator_set_pending)
-
-  // TODO: vfuncs
 };
 
 } // namespace Gio

Modified: trunk/gio/src/fileinputstream.hg
==============================================================================
--- trunk/gio/src/fileinputstream.hg	(original)
+++ trunk/gio/src/fileinputstream.hg	Wed Feb 27 17:25:57 2008
@@ -50,7 +50,7 @@
    * while querying the stream. For the asynchronous (non-blocking) version 
    * of this function, see query_info_async(). While the 
    * stream is blocked, the stream will set the pending flag internally, and 
-   * any other operations on the stream will fail with IO_ERROR_PENDING.
+   * any other operations on the stream will throw a Gio::Error with PENDING.
    *
    * @param attributes A file attribute query string.
    * @param cancellable A Cancellable object.
@@ -66,7 +66,7 @@
    * while querying the stream. For the asynchronous (non-blocking) version 
    * of this function, see query_info_async(). While the 
    * stream is blocked, the stream will set the pending flag internally, and 
-   * any other operations on the stream will fail with IO_ERROR_PENDING.
+   * any other operations on the stream will throw a Gio::Error with PENDING.
    *
    * @param attributes A file attribute query string.
    * @return A FileInfo, or an empty RefPtr on error.
@@ -81,8 +81,8 @@
 
   /** Queries the stream information asynchronously. For the synchronous version of this function, see query_info().
    *
-   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, the error 
-   * IO_ERROR_CANCELLED will be set.
+   * The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, 
+   * a Gio::Error with CANCELLED will be thrown.
    *
    * When the operation is finished, @a slot will be called. You can then call query_info_finish() to get the result of the operation.
    *

Modified: trunk/gio/src/filemonitor.hg
==============================================================================
--- trunk/gio/src/filemonitor.hg	(original)
+++ trunk/gio/src/filemonitor.hg	Wed Feb 27 17:25:57 2008
@@ -57,7 +57,6 @@
 #m4 _CONVERSION(`GFile*',`const Glib::RefPtr<File>&',`Glib::wrap($3, true)')
   _WRAP_SIGNAL(void changed(const Glib::RefPtr<File>& file, const Glib::RefPtr<File>& other_file, FileMonitorEvent event_type), "changed")
   
-  //TODO: Write .defs for the vfunc:
   //_WRAP_VFUNC(bool cancel(), cancel);
 
   _WRAP_PROPERTY("rate-limit", int)

Modified: trunk/gio/src/fileoutputstream.hg
==============================================================================
--- trunk/gio/src/fileoutputstream.hg	(original)
+++ trunk/gio/src/fileoutputstream.hg	Wed Feb 27 17:25:57 2008
@@ -49,24 +49,22 @@
   _IMPLEMENTS_INTERFACE(Seekable)
 
 public:
-  //TODO: vfuncs and overloads without Cancellable
-
 
   /** Queries a file output stream for the given @a attributes . 
    * This function blocks while querying the stream. For the asynchronous 
    * version of this function, see query_info_async(). 
    * While the stream is blocked, the stream will set the pending flag 
-   * internally, and any other operations on the stream will fail with 
-   * IO_ERROR_PENDING.
+   * internally, and any other operations on the stream will throw a Gio::Error with 
+   * PENDING.
    * 
-   * Can fail if the stream was already closed (with an 
-   * IO_ERROR_CLOSED error), the stream has pending operations (with an IO_ERROR_PENDING error),
+   * Can fail if the stream was already closed (with a 
+   * CLOSED error), the stream has pending operations (with a PENDING error),
    * or if querying info is not supported for 
-   * the stream's interface (with an IO_ERROR_NOT_SUPPORTED error). In
+   * the stream's interface (with a NOT_SUPPORTED error). In
    * all cases of failure, an empty RefPtr will be returned.
    * 
    * The operation can be cancelled by triggering the cancellable object from another thread. If the operation
-   * was cancelled, the error IO_ERROR_CANCELLED will be set, and an empty RefPtr will 
+   * was cancelled, a Gio::Error with CANCELLED may be thrown, and an empty RefPtr will 
    * be returned.
    *
    * @param cancellable A Cancellable object.
@@ -83,17 +81,17 @@
    * This function blocks while querying the stream. For the asynchronous 
    * version of this function, see query_info_async(). 
    * While the stream is blocked, the stream will set the pending flag 
-   * internally, and any other operations on the stream will fail with 
-   * IO_ERROR_PENDING.
+   * internally, and any other operations on the stream will throw a Gio::Error with 
+   * PENDING.
    * 
-   * Can fail if the stream was already closed (with an 
-   * IO_ERROR_CLOSED error), the stream has pending operations (with an IO_ERROR_PENDING error),
+   * Can fail if the stream was already closed (with a CLOSED error), 
+   * the stream has pending operations (with an PENDING error),
    * or if querying info is not supported for 
-   * the stream's interface (with an IO_ERROR_NOT_SUPPORTED error). In
+   * the stream's interface (with a NOT_SUPPORTED error). In
    * all cases of failure, an empty RefPtr will be returned.
    * 
    * The operation can be cancelled by triggering the cancellable object from another thread. If the operation
-   * was cancelled, the error IO_ERROR_CANCELLED will be set, and an empty RefPtr will 
+   * was cancelled, a Gio::Error with CANCELLED may be thrown, and an empty RefPtr will 
    * be returned.
    *
    * @param cancellable A Cancellable object.
@@ -119,7 +117,7 @@
    * 
    * If @a cancellable is not %NULL, then the operation can be cancelled by
    * triggering the cancellable object from another thread. If the operation
-   * was cancelled, the error %G_IO_ERROR_CANCELLED will be set
+   * was cancelled, a Gio::Error with CANCELLED may be thrown
    * 
    * @param slot Callback to call when the request is satisfied.
    * @param cancellable A Cancellable object.

Modified: trunk/gio/src/gio_docs_override.xml
==============================================================================
--- trunk/gio/src/gio_docs_override.xml	(original)
+++ trunk/gio/src/gio_docs_override.xml	Wed Feb 27 17:25:57 2008
@@ -1340,7 +1340,7 @@
 was cancelled, a Gio::Error will be thrown with CANCELLED. 
 
 If the file does not exist, a Gio::Error with NOT_FOUND will be thrown.
-If the file is not a directory, a Gio::Error with FILE_ERROR_NOTDIR will be returned.
+If the file is not a directory, a Glib::FileError with NOTDIR will be returned.
 Other errors are possible too.
 
 

Modified: trunk/gio/src/inputstream.hg
==============================================================================
--- trunk/gio/src/inputstream.hg	(original)
+++ trunk/gio/src/inputstream.hg	Wed Feb 27 17:25:57 2008
@@ -47,14 +47,14 @@
    *  @a buffer. Will block during this read.
    * 
    * If count is zero returns zero and does nothing. A value of @a count 
-   * larger than MAXSSIZE will cause an IO_ERROR_INVALID_ARGUMENT error.
+   * larger than MAXSSIZE will cause a Gio::Error with INVALID_ARGUMENT to be thrown.
    * 
    * On success, the number of bytes read into the buffer is returned.
    * It is not an error if this is not the same as the requested size, as it
    * can happen e.g. near the end of a file. Zero is returned on end of file
    * (or if @a count is zero), but never otherwise.
    * 
-   * On error -1 is returned and @a error is set accordingly.
+   * On error -1 is returned.
    * @param buffer A buffer to read data into (which should be at least count bytes long).
    * @param count The number of bytes that will be read from the stream.
    * @return Number of bytes read, or -1 on error.
@@ -86,8 +86,8 @@
    * stream, <tt>true</tt> is returned, and @a bytes_read is set to the number of bytes
    * read into @a buffer .
    * 
-   * If there is an error during the operation <tt>false</tt> is returned and @a error 
-   * is set to indicate the error status, @a bytes_read is updated to contain
+   * If there is an error during the operation <tt>false</tt> is returned and a Gio::Error 
+   * is thrown to indicate the error status, @a bytes_read is updated to contain
    * the number of bytes read into @a buffer before the error occured.
    * @param buffer A buffer to read data into (which should be at least count bytes long).
    * @param count The number of bytes that will be read from the stream.
@@ -131,7 +131,7 @@
 
   /** Closes the stream, releasing resources related to it.
    * 
-   * Once the stream is closed, all other operations will return IO_ERROR_CLOSED.
+   * Once the stream is closed, all other operations will throw a Gio::Error with CLOSED.
    * Closing a stream multiple times will not return an error.
    * 
    * Streams will be automatically closed when the last reference
@@ -144,7 +144,7 @@
    * 
    * On failure the first error that happened will be reported, but the close
    * operation will finish as much as possible. A stream that failed to
-   * close will still return IO_ERROR_CLOSED all operations. Still, it
+   * close will still throw a Gio::Error with CLOSED for all operations. Still, it
    * is important to check and report the error to the user.
    * 
    * @return <tt>true</tt> on success, <tt>false</tt> on failure.
@@ -161,9 +161,9 @@
    * operation.
    *
    * During an async request no other sync and async calls are allowed, and will
-   * result in IO_ERROR_PENDING errors. 
+   * result in Gio::Error with PENDING being thrown. 
    *
-   * A value of @a count larger than MAXSSIZE will cause an IO_ERROR_INVALID_ARGUMENT error.
+   * A value of @a count larger than MAXSSIZE will cause a Gio::Error with INVALID_ARGUMENT to be thrown.
    *
    * On success, the number of bytes read into the buffer will be passed to the
    * @a slot callback. It is not an error if this is not the same as the requested size, as it
@@ -193,9 +193,9 @@
    * operation.
    *
    * During an async request no other sync and async calls are allowed, and will
-   * result in IO_ERROR_PENDING errors. 
+   * result in a Gio::Error with PENDING being thrown. 
    *
-   * A value of @a count larger than MAXSSIZE will cause an IO_ERROR_INVALID_ARGUMENT error.
+   * A value of @a count larger than MAXSSIZE will cause a Gio::Error with INVALID_ARGUMENT to be thrown.
    *
    * On success, the number of bytes read into the buffer will be passed to the
    * @a slot callback. It is not an error if this is not the same as the requested size, as it
@@ -230,9 +230,9 @@
    * You can then call skip_finish() to get the result of the operation.
    *
    * During an async request no other sync and async calls are allowed, and will
-   * result in IO_ERROR_PENDING errors. 
+   * result in Gio::Error with PENDING being thrown. 
    *
-   * A value of @a count larger than MAXSSIZE will cause an IO_ERROR_INVALID_ARGUMENT error.
+   * A value of @a count larger than MAXSSIZE will cause a Gio::Error with INVALID_ARGUMENT to be thrown.
    *
    * On success, the number of bytes skipped will be passed to the
    * callback. It is not an error if this is not the same as the requested size, as it
@@ -260,9 +260,9 @@
    * You can then call skip_finish() to get the result of the operation.
    *
    * During an async request no other sync and async calls are allowed, and will
-   * result in IO_ERROR_PENDING errors. 
+   * result in Gio::Error with PENDING being thrown. 
    *
-   * A value of @a count larger than MAXSSIZE will cause an IO_ERROR_INVALID_ARGUMENT error.
+   * A value of @a count larger than MAXSSIZE will cause a Gio::Error with INVALID_ARGUMENT to be thrown.
    *
    * On success, the number of bytes skipped will be passed to the
    * callback. It is not an error if this is not the same as the requested size, as it

Modified: trunk/gio/src/loadableicon.hg
==============================================================================
--- trunk/gio/src/loadableicon.hg	(original)
+++ trunk/gio/src/loadableicon.hg	Wed Feb 27 17:25:57 2008
@@ -81,7 +81,6 @@
 
 protected:
   //_WRAP_VFUNC(Glib::RefPtr<InputStream> load(int size, Glib::ustring& type, const Glib::RefPtr<Cancellable>& cancellable), "load")
-  // TODO: wrap async vfuncs
 };
 
 

Modified: trunk/gio/src/mount.hg
==============================================================================
--- trunk/gio/src/mount.hg	(original)
+++ trunk/gio/src/mount.hg	Wed Feb 27 17:25:57 2008
@@ -37,7 +37,13 @@
 class Drive;
 //class Volume;
 
-/** TODO: 
+/** The Mount interface represents user-visible mounts.
+ * Mount is a "mounted" filesystem that you can access. Mounted is in quotes because it's not the same as a unix mount: 
+ * it might be a gvfs mount, but you can still access the files on it if you use GIO. It might or might not be related to a volume object.
+ *
+ * Unmounting a Mount instance is an asynchronous operation. For more information about asynchronous operations, see AsyncReady. 
+ * To unmount a Mount instance, first call unmount(). The callback slot will be called when the operation has resolved (either with success or failure), 
+ * and a AsyncReady structure will be passed to the callback. That callback should then call unmount_finish() with the AsyncReady data to see if the operation was completed successfully. 
  *
  * @newin2p16
  */

Modified: trunk/gio/src/outputstream.hg
==============================================================================
--- trunk/gio/src/outputstream.hg	(original)
+++ trunk/gio/src/outputstream.hg	Wed Feb 27 17:25:57 2008
@@ -48,7 +48,7 @@
    * during the operation.
    * 
    * If count is zero returns zero and does nothing. A value of @a count 
-   * larger than MAXSSIZE will cause a IO_ERROR_INVALID_ARGUMENT error.
+   * larger than MAXSSIZE will cause a Gio::Error with INVALID_ARGUMENT to be thrown.
    * 
    * On success, the number of bytes written to the stream is returned.
    * It is not an error if this is not the same as the requested size, as it
@@ -56,7 +56,7 @@
    * storage in the stream. All writes either block until at least one byte
    * is written, so zero is never returned (unless @a count  is zero).
    * 
-   * On error -1 is returned and @a error  is set accordingly.
+   * On error -1 is returned.
    * @param buffer The buffer containing the data to write.
    * @param count The number of bytes to write.
    * @return Number of bytes written, or -1 on error.
@@ -71,7 +71,7 @@
    * during the operation.
    * 
    * If count is zero returns zero and does nothing. A value of @a count 
-   * larger than MAXSSIZE will cause a IO_ERROR_INVALID_ARGUMENT error.
+   * larger than MAXSSIZE will cause a Gio::Error with INVALID_ARGUMENT to be thrown.
    * 
    * On success, the number of bytes written to the stream is returned.
    * It is not an error if this is not the same as the requested size, as it
@@ -79,7 +79,7 @@
    * storage in the stream. All writes either block until at least one byte
    * is written, so zero is never returned (unless @a count  is zero).
    * 
-   * On error -1 is returned and @a error  is set accordingly.
+   * On error -1 is returned.
    * @param buffer The buffer containing the data to write.
    * @param cancellable Cancellable object.
    * @return Number of bytes written, or -1 on error.
@@ -93,7 +93,7 @@
   /** Tries to write @a count  bytes from @a buffer  into the stream. Will block
    * during the operation.
    * 
-   * If string that is larger than MAXSSIZE bytes will cause a an IO_ERROR_INVALID_ARGUMENT error.
+   * If string that is larger than MAXSSIZE bytes will cause a Gio::Error with INVALID_ARGUMENT to be thrown.
    * 
    * On success, the number of bytes written to the stream is returned.
    * It is not an error if this is not the same as the requested size, as it
@@ -101,7 +101,7 @@
    * storage in the stream. All writes either block until at least one byte
    * is written, so zero is never returned (unless @a count  is zero).
    * 
-   * On error -1 is returned and @a error  is set accordingly.
+   * On error -1 is returned.
    * @param buffer The buffer containing the data to write.
    * @return Number of bytes written, or -1 on error.
    */
@@ -226,7 +226,7 @@
    * 
    * If @a cancellable  is not <tt>0</tt>, then the operation can be cancelled by
    * triggering the cancellable object from another thread. If the operation
-   * was cancelled, the error IO_ERROR_CANCELLED will be returned.
+   * was cancelled, a Gio::Error with CANCELLED will be thrown.
    * @param cancellable Optional cancellable object.
    * @param error Location to store the error occuring, or <tt>0</tt> to ignore.
    * @return <tt>true</tt> on success, <tt>false</tt> on error.
@@ -243,7 +243,7 @@
 
   /** Closes the stream, releasing resources related to it.
    * 
-   * Once the stream is closed, all other operations will return IO_ERROR_CLOSED.
+   * Once the stream is closed, all other operations will throw a Gio::Error with CLOSED.
    * Closing a stream multiple times will not return an error.
    * 
    * Closing a stream will automatically flush any outstanding buffers in the
@@ -259,13 +259,13 @@
    * 
    * On failure the first error that happened will be reported, but the close
    * operation will finish as much as possible. A stream that failed to
-   * close will still return IO_ERROR_CLOSED all operations. Still, it
+   * close will still throw a Gio::Error with CLOSED for all operations. Still, it
    * is important to check and report the error to the user, otherwise
    * there might be a loss of data as all data might not be written.
    * 
    * If @a cancellable  is not <tt>0</tt>, then the operation can be cancelled by
    * triggering the cancellable object from another thread. If the operation
-   * was cancelled, the error IO_ERROR_CANCELLED will be returned.
+   * was cancelled, a Gio::Error with CANCELLED will be thrown.
    * Cancelling a close will still leave the stream closed, but there some streams
    * can use a faster close that doesn't block to e.g. check errors. On
    * cancellation (as with any error) there is no guarantee that all written
@@ -286,10 +286,10 @@
    * operation.
    *
    * During an async request no other sync and async calls are allowed, 
-   * and will result in IO_ERROR_PENDING errors. 
+   * and will result in Gio::Error with PENDING being thrown. 
    *
-   * A value of @a count larger than MAXSSIZE will cause an 
-   * IO_ERROR_INVALID_ARGUMENT error.
+   * A value of @a count larger than MAXSSIZE will cause a Gio::Error with  
+   * NVALID_ARGUMENT to be thrown.
    *
    * On success, the number of bytes written will be passed to the
    * callback @a slot. It is not an error if this is not the same as the 
@@ -321,10 +321,10 @@
    * operation.
    *
    * During an async request no other sync and async calls are allowed, 
-   * and will result in IO_ERROR_PENDING errors. 
+   * and will result in Gio::Error with PENDING being thrown. 
    *
-   * A value of @a count larger than MAXSSIZE will cause an 
-   * IO_ERROR_INVALID_ARGUMENT error.
+   * A value of @a count larger than MAXSSIZE will cause a Gio::Error with  
+   * INVALID_ARGUMENT to be thrown.
    *
    * On success, the number of bytes written will be passed to the
    * callback @a slot. It is not an error if this is not the same as the 
@@ -450,7 +450,6 @@
   // These are private inside the module (for implementations)
   _IGNORE(g_output_stream_has_pending, g_output_stream_is_closed, g_output_stream_set_pending, g_output_stream_clear_pending)
 
-  //TODO: vfuncs.
 };
 
 } // namespace Gio

Modified: trunk/gio/src/seekable.hg
==============================================================================
--- trunk/gio/src/seekable.hg	(original)
+++ trunk/gio/src/seekable.hg	Wed Feb 27 17:25:57 2008
@@ -82,7 +82,6 @@
   bool truncate(goffset offset, std::auto_ptr<Glib::Error>& error);
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 
-//TODO: Write the .defs for these:
   //_WRAP_VFUNC(goffset tell() const, tell)
   //_WRAP_VFUNC(goffset can_seek() const, can_seek)
   //_WRAP_VFUNC(goffset seek(goffset offset, Glib::SeekType type, const Glib::RefPtr<Cancellable>& cancellable, GError** error), seek)

Modified: trunk/gio/src/volume.hg
==============================================================================
--- trunk/gio/src/volume.hg	(original)
+++ trunk/gio/src/volume.hg	Wed Feb 27 17:25:57 2008
@@ -152,7 +152,6 @@
   _WRAP_METHOD(Glib::StringArrayHandle enumerate_identifiers() const,
                g_volume_enumerate_identifiers)
 
-  //TODO: For some reason these are not in gio_signals.defs. We may need to hand-write them in gio_others.defs. murrayc.
   _WRAP_SIGNAL(void changed(), changed)
   _WRAP_SIGNAL(void removed(), removed)