#include "../client/directory.h"
#include "FileInfo.h"
#include "split.h"
+#include "../client/vfs-slave.h"
static void impl_Captive_Directory_fini(impl_POA_Captive_Directory *servant,CORBA_Environment *ev);
static void impl_Captive_Directory_read
- (impl_POA_Captive_Directory *servant,Captive_GnomeVFSFileInfo **file_info,CORBA_Environment *ev);
+ (impl_POA_Captive_Directory *servant,Captive_CaptiveFileInfoObject **file_info,CORBA_Environment *ev);
static void impl_Captive_Directory_remove(impl_POA_Captive_Directory *servant,CORBA_Environment *ev);
static void impl_Captive_Directory_shutdown(impl_POA_Captive_Directory *servant,CORBA_Environment *ev);
impl_POA_Captive_Directory *retval_servant;
GnomeVFSResult errvfsresult;
- g_return_val_if_fail(servant->captive_vfs_object!=NULL,NULL); /* not yet initialized? */
+ g_return_val_if_fail(CAPTIVE_VFS_SLAVE_IS_OBJECT(servant->captive_vfs_object),NULL); /* not yet initialized? */
retval=impl_Captive_Directory__create(servant->poa,ev);
if (ev->_major!=CORBA_NO_EXCEPTION)
impl_POA_Captive_Directory *retval_servant;
GnomeVFSResult errvfsresult;
- g_return_val_if_fail(servant->captive_vfs_object!=NULL,NULL); /* not yet initialized? */
+ g_return_val_if_fail(CAPTIVE_VFS_SLAVE_IS_OBJECT(servant->captive_vfs_object),NULL); /* not yet initialized? */
retval=impl_Captive_Directory__create(servant->poa,ev);
if (ev->_major!=CORBA_NO_EXCEPTION)
static void impl_Captive_Directory_read
- (impl_POA_Captive_Directory *servant,Captive_GnomeVFSFileInfo **file_info_corba_return,CORBA_Environment *ev)
+ (impl_POA_Captive_Directory *servant,Captive_CaptiveFileInfoObject **file_info_corba_return,CORBA_Environment *ev)
{
-GnomeVFSFileInfo file_info_captive;
-Captive_GnomeVFSFileInfo *file_info_corba;
+CaptiveFileInfoObject *file_info_captive;
+Captive_CaptiveFileInfoObject *file_info_corba;
GnomeVFSResult errvfsresult;
if (GNOME_VFS_OK!=(errvfsresult=captive_directory_read(servant->captive_directory_object,&file_info_captive))) {
return;
}
- file_info_corba=Captive_GnomeVFSFileInfo__alloc();
+ file_info_corba=Captive_CaptiveFileInfoObject__alloc();
- if (GNOME_VFS_OK!=(errvfsresult=captive_sandbox_file_info_captive_to_corba(
- file_info_corba,&file_info_captive))) {
+ errvfsresult=captive_sandbox_file_info_captive_to_corba(file_info_corba,file_info_captive);
+ g_object_unref(file_info_captive);
+
+ if (GNOME_VFS_OK!=errvfsresult) {
captive_sandbox_child_GnomeVFSResultException_throw(ev,errvfsresult);
- Captive_GnomeVFSFileInfo__freekids(file_info_corba,NULL/* 'd'; meaning? */);
+ Captive_CaptiveFileInfoObject__freekids(file_info_corba,NULL/* 'd'; meaning? */);
CORBA_free(file_info_corba);
return;
}
servant, /* data */
NULL); /* notify */
g_source_attach(source,
- g_main_loop_get_context(linc_main_get_loop())); /* context; NULL means 'default context' */
+ captive_corba_get_context()); /* context; NULL means 'default context' */
g_source_unref(source);
}