X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=src%2Flibcaptive%2Fsandbox%2Fserver-Directory.c;h=c77a6055b2474f341c581689656e5691c01ee1b4;hb=21dea5024c2fba9bcbe080dbd917dd27562c1190;hp=069db402f7dfcec1ab8a9ecd3e526fd07de60268;hpb=04202aa070fd3543613881f73ea46e7010720c90;p=captive.git

diff --git a/src/libcaptive/sandbox/server-Directory.c b/src/libcaptive/sandbox/server-Directory.c
index 069db40..c77a605 100644
--- a/src/libcaptive/sandbox/server-Directory.c
+++ b/src/libcaptive/sandbox/server-Directory.c
@@ -31,7 +31,7 @@
 
 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);
 
@@ -150,10 +150,10 @@ GnomeVFSResult errvfsresult;
 
 
 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))) {
@@ -161,12 +161,14 @@ GnomeVFSResult errvfsresult;
 		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;
 		}