Renamed "GlibLogFunc" to "GLogFunc"

+backward image iochannel over CORBA transport to be sandboxable

diff --git a/src/libcaptive/client/vfs.h b/src/libcaptive/client/vfs.h
index 9b39311..c9ce143 100644 (file)
--- a/src/libcaptive/client/vfs.h
+++ b/src/libcaptive/client/vfs.h
@@ -37,7 +37,8 @@ struct _CaptiveVfsObject {
 
        gboolean is_sandbox_parent;
                Captive_Vfs corba_Vfs_object;
-               Captive_GlibLogFunc corba_GlibLogFunc_object;
+               Captive_GLogFunc corba_GLogFunc_object;
+               Captive_CaptiveIOChannel corba_CaptiveIOChannel_object;
                int corba_parentheart_fds_1;
        };
 struct _CaptiveVfsObjectClass {

diff --git a/src/libcaptive/sandbox/Makefile.am b/src/libcaptive/sandbox/Makefile.am
index c72e532..53a774a 100644 (file)
--- a/src/libcaptive/sandbox/Makefile.am
+++ b/src/libcaptive/sandbox/Makefile.am
@@ -30,19 +30,23 @@ libsandbox_la_SOURCES= \
                $(SANDBOX_IDL_SOURCES) \
                FileInfo.c \
                FileInfo.h \
+               client-CaptiveIOChannel.c \
+               client-CaptiveIOChannel.h \
                parent-Directory.c \
                parent-File.c \
                parent-Vfs.c \
-               split.c \
-               split.h \
-               server-GlibLogFunc.c \
-               server-GlibLogFunc.h \
+               server-CaptiveIOChannel.c \
+               server-CaptiveIOChannel.h \
                server-Directory.c \
                server-Directory.h \
                server-File.c \
                server-File.h \
+               server-GLogFunc.c \
+               server-GLogFunc.h \
                server-Vfs.c \
-               server-Vfs.h
+               server-Vfs.h \
+               split.c \
+               split.h
 
 libsandbox_la_CFLAGS=$(ORBIT_CFLAGS) $(LINC_CFLAGS) $(GNOME_VFS_MODULE_CFLAGS)