gnome-vfs2-devel-2.2.2-4 compatibility (GNOME_VFS_ERROR_LAUNCH not defined).
authorshort <>
Tue, 16 Sep 2003 14:12:48 +0000 (14:12 +0000)
committershort <>
Tue, 16 Sep 2003 14:12:48 +0000 (14:12 +0000)
src/libcaptive/client/file-parent.c
src/libcaptive/client/file-slave.c

index 20b46e8..e0348ff 100644 (file)
@@ -355,7 +355,7 @@ gint retried_commit=0;
                if (GNOME_VFS_ERROR_SERVICE_NOT_AVAILABLE
                                !=(r=captive_sandbox_parent_file_write(captive_file_parent_object,buffer,num_bytes,bytes_written_return))) {
                        /* Occured: ExRaiseStatus(STATUS_LOG_FILE_FULL); */
-                       if (GNOME_VFS_ERROR_LAUNCH==r) {
+                       if (GNOME_VFS_ERROR_SERVICE_OBSOLETE==r) {
                                if (!retried_commit++) {
                                        if (GNOME_VFS_OK!=(r=captive_vfs_commit(captive_file_object->vfs)))
                                                return r;
@@ -363,7 +363,7 @@ gint retried_commit=0;
                                        continue;
                                        }
                                }
-                       g_assert(*bytes_written_return==num_bytes);     /* Not GNOME_VFS_ERROR_LAUNCH. */
+                       g_assert(*bytes_written_return==num_bytes);     /* Not GNOME_VFS_ERROR_SERVICE_OBSOLETE. */
                        if (GNOME_VFS_OK==r)
                                captive_parent_connector_set_dirty(CAPTIVE_PARENT_CONNECTOR(captive_file_parent_object));
                        return r;
index 42b17aa..46c914a 100644 (file)
@@ -381,7 +381,7 @@ GnomeVFSResult errvfsresult;
                 * really occured. We expect so and we will remount the volume.
                 */
                *bytes_written_return=0;
-               return GNOME_VFS_ERROR_LAUNCH;
+               return GNOME_VFS_ERROR_SERVICE_OBSOLETE;
                }
        g_return_val_if_fail(file_IoStatusBlock.Information==num_bytes,GNOME_VFS_ERROR_GENERIC);