Initial original import from: fuse-2.4.2-2.fc4

[captive.git] / src / libcaptive / sandbox / client-CaptiveIOChannel.c

diff --git a/src/libcaptive/sandbox/client-CaptiveIOChannel.c b/src/libcaptive/sandbox/client-CaptiveIOChannel.c
index fb3e62c..17faf8d 100644 (file)
--- a/src/libcaptive/sandbox/client-CaptiveIOChannel.c
+++ b/src/libcaptive/sandbox/client-CaptiveIOChannel.c
@@ -24,7 +24,7 @@
 #include "split.h"
 #include <string.h>
 #include "captive/macros.h"
-#include "../client/giochannel-blind.h"        /* for captive_giochannel_setup() */
+#include "../client/lib.h"     /* for captive_giochannel_setup() */
 
 
 struct captive_io_channel {
@@ -59,7 +59,7 @@ Captive_Bytes *buffer_corba;
        *bytes_read_return=0;
 
        Captive_CaptiveIOChannel_read(captive_io_channel->corba_captive_io_channel,&buffer_corba,count,&captive_corba_ev);
-       if (GNOME_VFS_OK!=captive_sandbox_parent_return_from_CORBA_Environment(&captive_corba_ev))
+       if (GNOME_VFS_OK!=captive_sandbox_parent_return_from_CORBA_Environment(&captive_corba_ev,NULL))
                return G_IO_STATUS_ERROR;
 
        g_return_val_if_fail(buffer_corba->_length<=count,G_IO_STATUS_ERROR);
@@ -93,7 +93,7 @@ Captive_GSize bytes_written_corba;
 
        Captive_CaptiveIOChannel_write(captive_io_channel->corba_captive_io_channel,
                        &buffer_corba_local,&bytes_written_corba,&captive_corba_ev);
-       if (GNOME_VFS_OK!=captive_sandbox_parent_return_from_CORBA_Environment(&captive_corba_ev))
+       if (GNOME_VFS_OK!=captive_sandbox_parent_return_from_CORBA_Environment(&captive_corba_ev,NULL))
                return G_IO_STATUS_ERROR;
 
        *bytes_written_return=bytes_written_corba;
@@ -109,7 +109,7 @@ struct captive_io_channel *captive_io_channel=(struct captive_io_channel *)chann
        g_return_val_if_fail(validate_captive_io_channel(captive_io_channel),G_IO_STATUS_ERROR);
 
        Captive_CaptiveIOChannel_seek(captive_io_channel->corba_captive_io_channel,offset,type,&captive_corba_ev);
-       if (GNOME_VFS_OK!=captive_sandbox_parent_return_from_CORBA_Environment(&captive_corba_ev))
+       if (GNOME_VFS_OK!=captive_sandbox_parent_return_from_CORBA_Environment(&captive_corba_ev,NULL))
                return G_IO_STATUS_ERROR;
 
        return G_IO_STATUS_NORMAL;
@@ -205,7 +205,7 @@ struct captive_io_channel *captive_io_channel;
        captive_io_channel->iochannel.close_on_unref=TRUE;      /* run g_io_channel_shutdown() flush on last unref */
        captive_io_channel->corba_captive_io_channel=corba_captive_io_channel;
 
-       captive_giochannel_setup(captive_io_channel);
+       captive_giochannel_setup(&captive_io_channel->iochannel);
 
        return captive_io_channel;
 }
@@ -223,7 +223,7 @@ struct captive_io_channel *captive_io_channel;
        captive_io_channel=(struct captive_io_channel *)giochannel;
 
        *size_return=Captive_CaptiveIOChannel_size(captive_io_channel->corba_captive_io_channel,&captive_corba_ev);
-       if (GNOME_VFS_OK!=captive_sandbox_parent_return_from_CORBA_Environment(&captive_corba_ev))
+       if (GNOME_VFS_OK!=captive_sandbox_parent_return_from_CORBA_Environment(&captive_corba_ev,NULL))
                return FALSE;
 
        return TRUE;