Commit 149fa4ae authored by Gene Z. Ragan's avatar Gene Z. Ragan Committed by Gene Ragan
Browse files

Fixed problem with previous change to this file. Allocated a static epv.

2000-07-03  Gene Z. Ragan  <gzr@eazel.com>

	* libnautilus-extensions/bonobo-stream-vfs.c:
	(bonobo_stream_vfs_class_init), (create_bonobo_stream_vfs):
	Fixed problem with previous change to this file.  Allocated
	a static epv.  Assigned this epv to the servants epv and then
	alocated the individual elements in the structure.
parent 178c8746
2000-07-03 Gene Z. Ragan <gzr@eazel.com>
* libnautilus-extensions/bonobo-stream-vfs.c:
(bonobo_stream_vfs_class_init), (create_bonobo_stream_vfs):
Fixed problem with previous change to this file. Allocated
a static epv. Assigned this epv to the servants epv and then
alocated the individual elements in the structure.
2000-07-03 Pavel Cisler <pavel@eazel.com>
* libnautilus-extensions/nautilus-list.c:
......
......@@ -30,6 +30,7 @@
#include <errno.h>
static BonoboStreamClass *bonobo_stream_vfs_parent_class;
static POA_Bonobo_Stream__vepv vepv;
static CORBA_long
vfs_write (BonoboStream *stream, const Bonobo_Stream_iobuf *buffer,
......@@ -227,6 +228,9 @@ bonobo_stream_vfs_class_init (BonoboStreamVFSClass *klass)
bonobo_stream_vfs_parent_class = gtk_type_class (bonobo_stream_get_type ());
vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
vepv.Bonobo_Stream_epv = bonobo_stream_get_epv ();
sclass->write = vfs_write;
sclass->read = vfs_read;
sclass->seek = vfs_seek;
......@@ -296,9 +300,8 @@ create_bonobo_stream_vfs (BonoboObject *object)
CORBA_Environment ev;
servant = (POA_Bonobo_Stream *) g_new0 (BonoboObjectServant, 1);
servant->vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
servant->vepv->Bonobo_Stream_epv = bonobo_stream_get_epv ();
servant->vepv = &vepv;
CORBA_exception_init (&ev);
POA_Bonobo_Stream__init ((PortableServer_Servant) servant, &ev);
......
......@@ -30,6 +30,7 @@
#include <errno.h>
static BonoboStreamClass *bonobo_stream_vfs_parent_class;
static POA_Bonobo_Stream__vepv vepv;
static CORBA_long
vfs_write (BonoboStream *stream, const Bonobo_Stream_iobuf *buffer,
......@@ -227,6 +228,9 @@ bonobo_stream_vfs_class_init (BonoboStreamVFSClass *klass)
bonobo_stream_vfs_parent_class = gtk_type_class (bonobo_stream_get_type ());
vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
vepv.Bonobo_Stream_epv = bonobo_stream_get_epv ();
sclass->write = vfs_write;
sclass->read = vfs_read;
sclass->seek = vfs_seek;
......@@ -296,9 +300,8 @@ create_bonobo_stream_vfs (BonoboObject *object)
CORBA_Environment ev;
servant = (POA_Bonobo_Stream *) g_new0 (BonoboObjectServant, 1);
servant->vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
servant->vepv->Bonobo_Stream_epv = bonobo_stream_get_epv ();
servant->vepv = &vepv;
CORBA_exception_init (&ev);
POA_Bonobo_Stream__init ((PortableServer_Servant) servant, &ev);
......
......@@ -30,6 +30,7 @@
#include <errno.h>
static BonoboStreamClass *bonobo_stream_vfs_parent_class;
static POA_Bonobo_Stream__vepv vepv;
static CORBA_long
vfs_write (BonoboStream *stream, const Bonobo_Stream_iobuf *buffer,
......@@ -227,6 +228,9 @@ bonobo_stream_vfs_class_init (BonoboStreamVFSClass *klass)
bonobo_stream_vfs_parent_class = gtk_type_class (bonobo_stream_get_type ());
vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
vepv.Bonobo_Stream_epv = bonobo_stream_get_epv ();
sclass->write = vfs_write;
sclass->read = vfs_read;
sclass->seek = vfs_seek;
......@@ -296,9 +300,8 @@ create_bonobo_stream_vfs (BonoboObject *object)
CORBA_Environment ev;
servant = (POA_Bonobo_Stream *) g_new0 (BonoboObjectServant, 1);
servant->vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
servant->vepv->Bonobo_Stream_epv = bonobo_stream_get_epv ();
servant->vepv = &vepv;
CORBA_exception_init (&ev);
POA_Bonobo_Stream__init ((PortableServer_Servant) servant, &ev);
......
......@@ -70,7 +70,7 @@ enum {
static guint signals[LAST_SIGNAL];
typedef struct {
POA_Nautilus_View servant;
POA_Nautilus_Zoomable servant;
gpointer bonobo_object;
NautilusZoomable *gtk_object;
......@@ -114,10 +114,11 @@ POA_Nautilus_Zoomable__epv libnautilus_Nautilus_Zoomable_epv =
(gpointer) &impl_Nautilus_Zoomable_zoom_to_fit
};
static PortableServer_ServantBase__epv base_epv;
//static PortableServer_ServantBase__epv base_epv;
static POA_Nautilus_Zoomable__vepv impl_Nautilus_Zoomable_vepv =
{
&base_epv,
// &base_epv,
NULL,
NULL,
&libnautilus_Nautilus_Zoomable_epv
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment