Re: Evolution still isn't working
- From: John Affleck <lists+garnome lists oddment net>
- To: William Lovaton <walovaton yahoo com mx>
- Cc: garnome-list gnome org
- Subject: Re: Evolution still isn't working
- Date: Mon, 8 Sep 2003 11:50:01 -0400
On Mon, Sep 08, 2003 at 10:08:58AM -0500, William Lovaton wrote:
> Damn... It didn't work for me. I had to downgrade
> ORbit and libbonobo. :-(
>
> I'll update them again and I'll try harder with this
> solution. I hope Ximian make a release soon to fix
> this annoying problem.
Hmm. I wonder if it's a stale idl compiler issue - the first time
I tried this, I potentially had an old garnome installation still
in my path. When I blew everything away and started again, it worked.
Also, purely out of interest,, I'm going to attach two patches that
show the differences between the files supplied by the evolution
tarball and the ones that were generated in my build. Maybe applying
these will get people up and running at least.
No guarantees these'll even apply cleanly, much less work.
Thanks,
John A.
diff -pNur evolution-1.4.4/libwombat/Evolution-Wombat-common.c evolution-1.4.4.new/libwombat/Evolution-Wombat-common.c
--- evolution-1.4.4/libwombat/Evolution-Wombat-common.c Mon Jun 30 14:20:05 2003
+++ evolution-1.4.4.new/libwombat/Evolution-Wombat-common.c Fri Sep 5 21:55:06 2003
@@ -10,6 +10,46 @@
static const CORBA_unsigned_long ORBit_zero_int = 0;
+#ifndef ORBIT_IDL_C_IMODULE_Evolution_Wombat
+void
+_ORBIT_skel_small_GNOME_Evolution_WombatClient_getPassword
+ (POA_GNOME_Evolution_WombatClient * _o_servant, gpointer _o_retval,
+ gpointer * _o_args, CORBA_Context _o_ctx, CORBA_Environment * _o_ev,
+ CORBA_string(*_impl_getPassword) (PortableServer_Servant _servant,
+ const CORBA_char * prompt,
+ const CORBA_char * key,
+ CORBA_Environment * ev))
+{
+ *(CORBA_string *) _o_retval =
+ _impl_getPassword(_o_servant, *(const CORBA_char * *) _o_args[0],
+ *(const CORBA_char * *) _o_args[1], _o_ev);
+}
+
+void
+_ORBIT_skel_small_GNOME_Evolution_WombatClient_forgetPassword
+ (POA_GNOME_Evolution_WombatClient * _o_servant, gpointer _o_retval,
+ gpointer * _o_args, CORBA_Context _o_ctx, CORBA_Environment * _o_ev,
+ void (*_impl_forgetPassword) (PortableServer_Servant _servant,
+ const CORBA_char * key,
+ CORBA_Environment * ev))
+{
+ _impl_forgetPassword(_o_servant, *(const CORBA_char * *) _o_args[0],
+ _o_ev);
+}
+
+void
+_ORBIT_skel_small_GNOME_Evolution_WombatInterfaceCheck__get_interfaceVersion
+ (POA_GNOME_Evolution_WombatInterfaceCheck * _o_servant, gpointer _o_retval,
+ gpointer * _o_args, CORBA_Context _o_ctx, CORBA_Environment * _o_ev,
+ CORBA_string(*_impl__get_interfaceVersion) (PortableServer_Servant
+ _servant,
+ CORBA_Environment * ev))
+{
+ *(CORBA_string *) _o_retval =
+ _impl__get_interfaceVersion(_o_servant, _o_ev);
+}
+
+#endif
#if ( (TC_IMPL_TC_GNOME_Evolution_WombatClient_0 == 'E') \
&& (TC_IMPL_TC_GNOME_Evolution_WombatClient_1 == 'v') \
&& (TC_IMPL_TC_GNOME_Evolution_WombatClient_2 == 'o') \
diff -pNur evolution-1.4.4/libwombat/Evolution-Wombat-skels.c evolution-1.4.4.new/libwombat/Evolution-Wombat-skels.c
--- evolution-1.4.4/libwombat/Evolution-Wombat-skels.c Mon Jun 30 14:20:05 2003
+++ evolution-1.4.4.new/libwombat/Evolution-Wombat-skels.c Fri Sep 5 21:55:06 2003
@@ -6,43 +6,6 @@
#define ORBIT2_STUBS_API
#include "Evolution-Wombat.h"
-void
-_ORBIT_skel_small_GNOME_Evolution_WombatClient_getPassword
- (POA_GNOME_Evolution_WombatClient * _o_servant, gpointer _o_retval,
- gpointer * _o_args, CORBA_Context _o_ctx, CORBA_Environment * _o_ev,
- CORBA_string(*_impl_getPassword) (PortableServer_Servant _servant,
- const CORBA_char * prompt,
- const CORBA_char * key,
- CORBA_Environment * ev))
-{
- *(CORBA_string *) _o_retval =
- _impl_getPassword(_o_servant, *(const CORBA_char * *) _o_args[0],
- *(const CORBA_char * *) _o_args[1], _o_ev);
-}
-
-void
-_ORBIT_skel_small_GNOME_Evolution_WombatClient_forgetPassword
- (POA_GNOME_Evolution_WombatClient * _o_servant, gpointer _o_retval,
- gpointer * _o_args, CORBA_Context _o_ctx, CORBA_Environment * _o_ev,
- void (*_impl_forgetPassword) (PortableServer_Servant _servant,
- const CORBA_char * key,
- CORBA_Environment * ev))
-{
- _impl_forgetPassword(_o_servant, *(const CORBA_char * *) _o_args[0],
- _o_ev);
-}
-
-void
-_ORBIT_skel_small_GNOME_Evolution_WombatInterfaceCheck__get_interfaceVersion
- (POA_GNOME_Evolution_WombatInterfaceCheck * _o_servant, gpointer _o_retval,
- gpointer * _o_args, CORBA_Context _o_ctx, CORBA_Environment * _o_ev,
- CORBA_string(*_impl__get_interfaceVersion) (PortableServer_Servant
- _servant,
- CORBA_Environment * ev))
-{
- *(CORBA_string *) _o_retval =
- _impl__get_interfaceVersion(_o_servant, _o_ev);
-}
static ORBitSmallSkeleton
get_skel_small_GNOME_Evolution_WombatClient(POA_GNOME_Evolution_WombatClient *
servant, const char *opname,
@@ -89,24 +52,14 @@ POA_GNOME_Evolution_WombatClient__init(P
(ORBit_small_impl_finder) & get_skel_small_GNOME_Evolution_WombatClient,
"IDL:GNOME/Evolution/WombatClient:1.0", &GNOME_Evolution_WombatClient__classid, NULL,
&GNOME_Evolution_WombatClient__iinterface };
- POA_GNOME_Evolution_WombatClient__vepv *fakevepv = NULL;
-
- if (((PortableServer_ServantBase *) servant)->vepv[0]->finalize == 0) {
- ((PortableServer_ServantBase *) servant)->vepv[0]->finalize =
- POA_GNOME_Evolution_WombatClient__fini;
- }
PortableServer_ServantBase__init(((PortableServer_ServantBase *) servant),
env);
- ORBit_classinfo_register(&class_info);
- ORBIT_SERVANT_SET_CLASSINFO(servant, &class_info);
-
- if (!class_info.vepvmap) {
- class_info.vepvmap =
- g_new0(ORBit_VepvIdx, GNOME_Evolution_WombatClient__classid + 1);
- class_info.vepvmap[GNOME_Evolution_WombatClient__classid] =
- (((char *) &(fakevepv->GNOME_Evolution_WombatClient_epv)) -
- ((char *) (fakevepv))) / sizeof(GFunc);
- }
+ ORBit_skel_class_register(&class_info, servant,
+ POA_GNOME_Evolution_WombatClient__fini,
+ ORBIT_VEPV_OFFSET
+ (POA_GNOME_Evolution_WombatClient__vepv,
+ GNOME_Evolution_WombatClient_epv),
+ (CORBA_unsigned_long) 0);
}
void
@@ -136,24 +89,14 @@ POA_GNOME_Evolution_Config__init(Portabl
{ NULL,
(ORBit_small_impl_finder) & get_skel_small_GNOME_Evolution_Config, "IDL:GNOME/Evolution/Config:1.0",
&GNOME_Evolution_Config__classid, NULL, &GNOME_Evolution_Config__iinterface };
- POA_GNOME_Evolution_Config__vepv *fakevepv = NULL;
-
- if (((PortableServer_ServantBase *) servant)->vepv[0]->finalize == 0) {
- ((PortableServer_ServantBase *) servant)->vepv[0]->finalize =
- POA_GNOME_Evolution_Config__fini;
- }
PortableServer_ServantBase__init(((PortableServer_ServantBase *) servant),
env);
- ORBit_classinfo_register(&class_info);
- ORBIT_SERVANT_SET_CLASSINFO(servant, &class_info);
-
- if (!class_info.vepvmap) {
- class_info.vepvmap =
- g_new0(ORBit_VepvIdx, GNOME_Evolution_Config__classid + 1);
- class_info.vepvmap[GNOME_Evolution_Config__classid] =
- (((char *) &(fakevepv->GNOME_Evolution_Config_epv)) -
- ((char *) (fakevepv))) / sizeof(GFunc);
- }
+ ORBit_skel_class_register(&class_info, servant,
+ POA_GNOME_Evolution_Config__fini,
+ ORBIT_VEPV_OFFSET
+ (POA_GNOME_Evolution_Config__vepv,
+ GNOME_Evolution_Config_epv),
+ (CORBA_unsigned_long) 0);
}
void
@@ -218,29 +161,19 @@ POA_GNOME_Evolution_WombatInterfaceCheck
(ORBit_small_impl_finder) & get_skel_small_GNOME_Evolution_WombatInterfaceCheck,
"IDL:GNOME/Evolution/WombatInterfaceCheck:1.0", &GNOME_Evolution_WombatInterfaceCheck__classid, NULL,
&GNOME_Evolution_WombatInterfaceCheck__iinterface };
- POA_GNOME_Evolution_WombatInterfaceCheck__vepv *fakevepv = NULL;
-
- if (((PortableServer_ServantBase *) servant)->vepv[0]->finalize == 0) {
- ((PortableServer_ServantBase *) servant)->vepv[0]->finalize =
- POA_GNOME_Evolution_WombatInterfaceCheck__fini;
- }
PortableServer_ServantBase__init(((PortableServer_ServantBase *) servant),
env);
POA_Bonobo_Unknown__init(servant, env);
- ORBit_classinfo_register(&class_info);
- ORBIT_SERVANT_SET_CLASSINFO(servant, &class_info);
-
- if (!class_info.vepvmap) {
- class_info.vepvmap =
- g_new0(ORBit_VepvIdx,
- GNOME_Evolution_WombatInterfaceCheck__classid + 1);
- class_info.vepvmap[Bonobo_Unknown__classid] =
- (((char *) &(fakevepv->Bonobo_Unknown_epv)) -
- ((char *) (fakevepv))) / sizeof(GFunc);
- class_info.vepvmap[GNOME_Evolution_WombatInterfaceCheck__classid] =
- (((char *) &(fakevepv->GNOME_Evolution_WombatInterfaceCheck_epv)) -
- ((char *) (fakevepv))) / sizeof(GFunc);
- }
+ ORBit_skel_class_register(&class_info,
+ servant,
+ POA_GNOME_Evolution_WombatInterfaceCheck__fini,
+ ORBIT_VEPV_OFFSET
+ (POA_GNOME_Evolution_WombatInterfaceCheck__vepv,
+ GNOME_Evolution_WombatInterfaceCheck_epv),
+ (CORBA_unsigned_long) Bonobo_Unknown__classid,
+ ORBIT_VEPV_OFFSET
+ (POA_GNOME_Evolution_WombatInterfaceCheck__vepv,
+ Bonobo_Unknown_epv), (CORBA_unsigned_long) 0);
}
void
diff -pNur evolution-1.4.4/libwombat/Evolution-Wombat-stubs.c evolution-1.4.4.new/libwombat/Evolution-Wombat-stubs.c
--- evolution-1.4.4/libwombat/Evolution-Wombat-stubs.c Mon Jun 30 14:20:05 2003
+++ evolution-1.4.4.new/libwombat/Evolution-Wombat-stubs.c Fri Sep 5 21:55:06 2003
@@ -13,29 +13,19 @@ GNOME_Evolution_WombatClient_getPassword
CORBA_Environment * ev)
{
CORBA_string _ORBIT_retval;
- POA_GNOME_Evolution_WombatClient__epv *_ORBIT_epv;
+ gpointer _args[2];
- if (ORBit_small_flags & ORBIT_SMALL_FAST_LOCALS &&
- ORBIT_STUB_IsBypass(_obj, GNOME_Evolution_WombatClient__classid) &&
- (_ORBIT_epv =
- (POA_GNOME_Evolution_WombatClient__epv *) ORBIT_STUB_GetEpv(_obj,
- GNOME_Evolution_WombatClient__classid))->
- getPassword) {
- ORBIT_STUB_PreCall(_obj);
- _ORBIT_retval =
- _ORBIT_epv->getPassword(ORBIT_STUB_GetServant(_obj), prompt, key,
- ev);
- ORBIT_STUB_PostCall(_obj);
- } else { /* remote marshal */
- gpointer _args[2];
-
- _args[0] = (gpointer) & prompt;
- _args[1] = (gpointer) & key;
- ORBit_small_invoke_stub_n(_obj,
- &GNOME_Evolution_WombatClient__iinterface.
- methods, 0, &_ORBIT_retval, _args, NULL, ev);
+ _args[0] = (gpointer) & prompt;
+ _args[1] = (gpointer) & key;
+ ORBit_c_stub_invoke(_obj,
+ &GNOME_Evolution_WombatClient__iinterface.methods, 0,
+ &_ORBIT_retval, _args, NULL, ev,
+ GNOME_Evolution_WombatClient__classid,
+ G_STRUCT_OFFSET(POA_GNOME_Evolution_WombatClient__epv,
+ getPassword),
+ (ORBitSmallSkeleton)
+ _ORBIT_skel_small_GNOME_Evolution_WombatClient_getPassword);
- }
return _ORBIT_retval;
}
@@ -44,51 +34,35 @@ GNOME_Evolution_WombatClient_forgetPassw
const CORBA_char * key,
CORBA_Environment * ev)
{
- POA_GNOME_Evolution_WombatClient__epv *_ORBIT_epv;
+ gpointer _args[1];
- if (ORBit_small_flags & ORBIT_SMALL_FAST_LOCALS &&
- ORBIT_STUB_IsBypass(_obj, GNOME_Evolution_WombatClient__classid) &&
- (_ORBIT_epv =
- (POA_GNOME_Evolution_WombatClient__epv *) ORBIT_STUB_GetEpv(_obj,
- GNOME_Evolution_WombatClient__classid))->
- forgetPassword) {
- ORBIT_STUB_PreCall(_obj);
- _ORBIT_epv->forgetPassword(ORBIT_STUB_GetServant(_obj), key, ev);
- ORBIT_STUB_PostCall(_obj);
- } else { /* remote marshal */
- gpointer _args[1];
-
- _args[0] = (gpointer) & key;
- ORBit_small_invoke_stub_n(_obj,
- &GNOME_Evolution_WombatClient__iinterface.
- methods, 1, NULL, _args, NULL, ev);
+ _args[0] = (gpointer) & key;
+ ORBit_c_stub_invoke(_obj,
+ &GNOME_Evolution_WombatClient__iinterface.methods, 1,
+ NULL, _args, NULL, ev,
+ GNOME_Evolution_WombatClient__classid,
+ G_STRUCT_OFFSET(POA_GNOME_Evolution_WombatClient__epv,
+ forgetPassword),
+ (ORBitSmallSkeleton)
+ _ORBIT_skel_small_GNOME_Evolution_WombatClient_forgetPassword);
- }
}
+
CORBA_string
GNOME_Evolution_WombatInterfaceCheck__get_interfaceVersion
(GNOME_Evolution_WombatInterfaceCheck _obj, CORBA_Environment * ev)
{
CORBA_string _ORBIT_retval;
- POA_GNOME_Evolution_WombatInterfaceCheck__epv *_ORBIT_epv;
- if (ORBit_small_flags & ORBIT_SMALL_FAST_LOCALS &&
- ORBIT_STUB_IsBypass(_obj,
- GNOME_Evolution_WombatInterfaceCheck__classid)
- && (_ORBIT_epv =
- (POA_GNOME_Evolution_WombatInterfaceCheck__epv *)
- ORBIT_STUB_GetEpv(_obj,
- GNOME_Evolution_WombatInterfaceCheck__classid))->
- _get_interfaceVersion) {
- ORBIT_STUB_PreCall(_obj);
- _ORBIT_retval =
- _ORBIT_epv->_get_interfaceVersion(ORBIT_STUB_GetServant(_obj), ev);
- ORBIT_STUB_PostCall(_obj);
- } else { /* remote marshal */
- ORBit_small_invoke_stub_n(_obj,
- &GNOME_Evolution_WombatInterfaceCheck__iinterface.
- methods, 0, &_ORBIT_retval, NULL, NULL, ev);
+ ORBit_c_stub_invoke(_obj,
+ &GNOME_Evolution_WombatInterfaceCheck__iinterface.
+ methods, 0, &_ORBIT_retval, NULL, NULL, ev,
+ GNOME_Evolution_WombatInterfaceCheck__classid,
+ G_STRUCT_OFFSET
+ (POA_GNOME_Evolution_WombatInterfaceCheck__epv,
+ _get_interfaceVersion),
+ (ORBitSmallSkeleton)
+ _ORBIT_skel_small_GNOME_Evolution_WombatInterfaceCheck__get_interfaceVersion);
- }
return _ORBIT_retval;
}
diff -pNur evolution-1.4.4/libwombat/Evolution-Wombat.h evolution-1.4.4.new/libwombat/Evolution-Wombat.h
--- evolution-1.4.4/libwombat/Evolution-Wombat.h Mon Jun 30 14:20:05 2003
+++ evolution-1.4.4.new/libwombat/Evolution-Wombat.h Fri Sep 5 21:55:06 2003
@@ -5,7 +5,7 @@
#ifndef Evolution_Wombat_H
#define Evolution_Wombat_H 1
#include <glib.h>
-#define ORBIT_IDL_SERIAL 19
+#define ORBIT_IDL_SERIAL 20
#include <orbit/orbit-types.h>
#ifdef __cplusplus
Binary files evolution-1.4.4/wombat/.libs/evolution-wombat and evolution-1.4.4.new/wombat/.libs/evolution-wombat differ
diff -pNur evolution-1.4.4/wombat/Evolution-Wombat-common.c evolution-1.4.4.new/wombat/Evolution-Wombat-common.c
--- evolution-1.4.4/wombat/Evolution-Wombat-common.c Mon Jun 30 14:22:09 2003
+++ evolution-1.4.4.new/wombat/Evolution-Wombat-common.c Fri Sep 5 22:06:52 2003
@@ -10,6 +10,46 @@
static const CORBA_unsigned_long ORBit_zero_int = 0;
+#ifndef ORBIT_IDL_C_IMODULE_Evolution_Wombat
+void
+_ORBIT_skel_small_GNOME_Evolution_WombatClient_getPassword
+ (POA_GNOME_Evolution_WombatClient * _o_servant, gpointer _o_retval,
+ gpointer * _o_args, CORBA_Context _o_ctx, CORBA_Environment * _o_ev,
+ CORBA_string(*_impl_getPassword) (PortableServer_Servant _servant,
+ const CORBA_char * prompt,
+ const CORBA_char * key,
+ CORBA_Environment * ev))
+{
+ *(CORBA_string *) _o_retval =
+ _impl_getPassword(_o_servant, *(const CORBA_char * *) _o_args[0],
+ *(const CORBA_char * *) _o_args[1], _o_ev);
+}
+
+void
+_ORBIT_skel_small_GNOME_Evolution_WombatClient_forgetPassword
+ (POA_GNOME_Evolution_WombatClient * _o_servant, gpointer _o_retval,
+ gpointer * _o_args, CORBA_Context _o_ctx, CORBA_Environment * _o_ev,
+ void (*_impl_forgetPassword) (PortableServer_Servant _servant,
+ const CORBA_char * key,
+ CORBA_Environment * ev))
+{
+ _impl_forgetPassword(_o_servant, *(const CORBA_char * *) _o_args[0],
+ _o_ev);
+}
+
+void
+_ORBIT_skel_small_GNOME_Evolution_WombatInterfaceCheck__get_interfaceVersion
+ (POA_GNOME_Evolution_WombatInterfaceCheck * _o_servant, gpointer _o_retval,
+ gpointer * _o_args, CORBA_Context _o_ctx, CORBA_Environment * _o_ev,
+ CORBA_string(*_impl__get_interfaceVersion) (PortableServer_Servant
+ _servant,
+ CORBA_Environment * ev))
+{
+ *(CORBA_string *) _o_retval =
+ _impl__get_interfaceVersion(_o_servant, _o_ev);
+}
+
+#endif
#if ( (TC_IMPL_TC_GNOME_Evolution_WombatClient_0 == 'E') \
&& (TC_IMPL_TC_GNOME_Evolution_WombatClient_1 == 'v') \
&& (TC_IMPL_TC_GNOME_Evolution_WombatClient_2 == 'o') \
diff -pNur evolution-1.4.4/wombat/Evolution-Wombat-skels.c evolution-1.4.4.new/wombat/Evolution-Wombat-skels.c
--- evolution-1.4.4/wombat/Evolution-Wombat-skels.c Mon Jun 30 14:22:09 2003
+++ evolution-1.4.4.new/wombat/Evolution-Wombat-skels.c Fri Sep 5 22:06:52 2003
@@ -6,43 +6,6 @@
#define ORBIT2_STUBS_API
#include "Evolution-Wombat.h"
-void
-_ORBIT_skel_small_GNOME_Evolution_WombatClient_getPassword
- (POA_GNOME_Evolution_WombatClient * _o_servant, gpointer _o_retval,
- gpointer * _o_args, CORBA_Context _o_ctx, CORBA_Environment * _o_ev,
- CORBA_string(*_impl_getPassword) (PortableServer_Servant _servant,
- const CORBA_char * prompt,
- const CORBA_char * key,
- CORBA_Environment * ev))
-{
- *(CORBA_string *) _o_retval =
- _impl_getPassword(_o_servant, *(const CORBA_char * *) _o_args[0],
- *(const CORBA_char * *) _o_args[1], _o_ev);
-}
-
-void
-_ORBIT_skel_small_GNOME_Evolution_WombatClient_forgetPassword
- (POA_GNOME_Evolution_WombatClient * _o_servant, gpointer _o_retval,
- gpointer * _o_args, CORBA_Context _o_ctx, CORBA_Environment * _o_ev,
- void (*_impl_forgetPassword) (PortableServer_Servant _servant,
- const CORBA_char * key,
- CORBA_Environment * ev))
-{
- _impl_forgetPassword(_o_servant, *(const CORBA_char * *) _o_args[0],
- _o_ev);
-}
-
-void
-_ORBIT_skel_small_GNOME_Evolution_WombatInterfaceCheck__get_interfaceVersion
- (POA_GNOME_Evolution_WombatInterfaceCheck * _o_servant, gpointer _o_retval,
- gpointer * _o_args, CORBA_Context _o_ctx, CORBA_Environment * _o_ev,
- CORBA_string(*_impl__get_interfaceVersion) (PortableServer_Servant
- _servant,
- CORBA_Environment * ev))
-{
- *(CORBA_string *) _o_retval =
- _impl__get_interfaceVersion(_o_servant, _o_ev);
-}
static ORBitSmallSkeleton
get_skel_small_GNOME_Evolution_WombatClient(POA_GNOME_Evolution_WombatClient *
servant, const char *opname,
@@ -89,24 +52,14 @@ POA_GNOME_Evolution_WombatClient__init(P
(ORBit_small_impl_finder) & get_skel_small_GNOME_Evolution_WombatClient,
"IDL:GNOME/Evolution/WombatClient:1.0", &GNOME_Evolution_WombatClient__classid, NULL,
&GNOME_Evolution_WombatClient__iinterface };
- POA_GNOME_Evolution_WombatClient__vepv *fakevepv = NULL;
-
- if (((PortableServer_ServantBase *) servant)->vepv[0]->finalize == 0) {
- ((PortableServer_ServantBase *) servant)->vepv[0]->finalize =
- POA_GNOME_Evolution_WombatClient__fini;
- }
PortableServer_ServantBase__init(((PortableServer_ServantBase *) servant),
env);
- ORBit_classinfo_register(&class_info);
- ORBIT_SERVANT_SET_CLASSINFO(servant, &class_info);
-
- if (!class_info.vepvmap) {
- class_info.vepvmap =
- g_new0(ORBit_VepvIdx, GNOME_Evolution_WombatClient__classid + 1);
- class_info.vepvmap[GNOME_Evolution_WombatClient__classid] =
- (((char *) &(fakevepv->GNOME_Evolution_WombatClient_epv)) -
- ((char *) (fakevepv))) / sizeof(GFunc);
- }
+ ORBit_skel_class_register(&class_info, servant,
+ POA_GNOME_Evolution_WombatClient__fini,
+ ORBIT_VEPV_OFFSET
+ (POA_GNOME_Evolution_WombatClient__vepv,
+ GNOME_Evolution_WombatClient_epv),
+ (CORBA_unsigned_long) 0);
}
void
@@ -136,24 +89,14 @@ POA_GNOME_Evolution_Config__init(Portabl
{ NULL,
(ORBit_small_impl_finder) & get_skel_small_GNOME_Evolution_Config, "IDL:GNOME/Evolution/Config:1.0",
&GNOME_Evolution_Config__classid, NULL, &GNOME_Evolution_Config__iinterface };
- POA_GNOME_Evolution_Config__vepv *fakevepv = NULL;
-
- if (((PortableServer_ServantBase *) servant)->vepv[0]->finalize == 0) {
- ((PortableServer_ServantBase *) servant)->vepv[0]->finalize =
- POA_GNOME_Evolution_Config__fini;
- }
PortableServer_ServantBase__init(((PortableServer_ServantBase *) servant),
env);
- ORBit_classinfo_register(&class_info);
- ORBIT_SERVANT_SET_CLASSINFO(servant, &class_info);
-
- if (!class_info.vepvmap) {
- class_info.vepvmap =
- g_new0(ORBit_VepvIdx, GNOME_Evolution_Config__classid + 1);
- class_info.vepvmap[GNOME_Evolution_Config__classid] =
- (((char *) &(fakevepv->GNOME_Evolution_Config_epv)) -
- ((char *) (fakevepv))) / sizeof(GFunc);
- }
+ ORBit_skel_class_register(&class_info, servant,
+ POA_GNOME_Evolution_Config__fini,
+ ORBIT_VEPV_OFFSET
+ (POA_GNOME_Evolution_Config__vepv,
+ GNOME_Evolution_Config_epv),
+ (CORBA_unsigned_long) 0);
}
void
@@ -218,29 +161,19 @@ POA_GNOME_Evolution_WombatInterfaceCheck
(ORBit_small_impl_finder) & get_skel_small_GNOME_Evolution_WombatInterfaceCheck,
"IDL:GNOME/Evolution/WombatInterfaceCheck:1.0", &GNOME_Evolution_WombatInterfaceCheck__classid, NULL,
&GNOME_Evolution_WombatInterfaceCheck__iinterface };
- POA_GNOME_Evolution_WombatInterfaceCheck__vepv *fakevepv = NULL;
-
- if (((PortableServer_ServantBase *) servant)->vepv[0]->finalize == 0) {
- ((PortableServer_ServantBase *) servant)->vepv[0]->finalize =
- POA_GNOME_Evolution_WombatInterfaceCheck__fini;
- }
PortableServer_ServantBase__init(((PortableServer_ServantBase *) servant),
env);
POA_Bonobo_Unknown__init(servant, env);
- ORBit_classinfo_register(&class_info);
- ORBIT_SERVANT_SET_CLASSINFO(servant, &class_info);
-
- if (!class_info.vepvmap) {
- class_info.vepvmap =
- g_new0(ORBit_VepvIdx,
- GNOME_Evolution_WombatInterfaceCheck__classid + 1);
- class_info.vepvmap[Bonobo_Unknown__classid] =
- (((char *) &(fakevepv->Bonobo_Unknown_epv)) -
- ((char *) (fakevepv))) / sizeof(GFunc);
- class_info.vepvmap[GNOME_Evolution_WombatInterfaceCheck__classid] =
- (((char *) &(fakevepv->GNOME_Evolution_WombatInterfaceCheck_epv)) -
- ((char *) (fakevepv))) / sizeof(GFunc);
- }
+ ORBit_skel_class_register(&class_info,
+ servant,
+ POA_GNOME_Evolution_WombatInterfaceCheck__fini,
+ ORBIT_VEPV_OFFSET
+ (POA_GNOME_Evolution_WombatInterfaceCheck__vepv,
+ GNOME_Evolution_WombatInterfaceCheck_epv),
+ (CORBA_unsigned_long) Bonobo_Unknown__classid,
+ ORBIT_VEPV_OFFSET
+ (POA_GNOME_Evolution_WombatInterfaceCheck__vepv,
+ Bonobo_Unknown_epv), (CORBA_unsigned_long) 0);
}
void
diff -pNur evolution-1.4.4/wombat/Evolution-Wombat-stubs.c evolution-1.4.4.new/wombat/Evolution-Wombat-stubs.c
--- evolution-1.4.4/wombat/Evolution-Wombat-stubs.c Mon Jun 30 14:22:09 2003
+++ evolution-1.4.4.new/wombat/Evolution-Wombat-stubs.c Fri Sep 5 22:06:52 2003
@@ -13,29 +13,19 @@ GNOME_Evolution_WombatClient_getPassword
CORBA_Environment * ev)
{
CORBA_string _ORBIT_retval;
- POA_GNOME_Evolution_WombatClient__epv *_ORBIT_epv;
+ gpointer _args[2];
- if (ORBit_small_flags & ORBIT_SMALL_FAST_LOCALS &&
- ORBIT_STUB_IsBypass(_obj, GNOME_Evolution_WombatClient__classid) &&
- (_ORBIT_epv =
- (POA_GNOME_Evolution_WombatClient__epv *) ORBIT_STUB_GetEpv(_obj,
- GNOME_Evolution_WombatClient__classid))->
- getPassword) {
- ORBIT_STUB_PreCall(_obj);
- _ORBIT_retval =
- _ORBIT_epv->getPassword(ORBIT_STUB_GetServant(_obj), prompt, key,
- ev);
- ORBIT_STUB_PostCall(_obj);
- } else { /* remote marshal */
- gpointer _args[2];
-
- _args[0] = (gpointer) & prompt;
- _args[1] = (gpointer) & key;
- ORBit_small_invoke_stub_n(_obj,
- &GNOME_Evolution_WombatClient__iinterface.
- methods, 0, &_ORBIT_retval, _args, NULL, ev);
+ _args[0] = (gpointer) & prompt;
+ _args[1] = (gpointer) & key;
+ ORBit_c_stub_invoke(_obj,
+ &GNOME_Evolution_WombatClient__iinterface.methods, 0,
+ &_ORBIT_retval, _args, NULL, ev,
+ GNOME_Evolution_WombatClient__classid,
+ G_STRUCT_OFFSET(POA_GNOME_Evolution_WombatClient__epv,
+ getPassword),
+ (ORBitSmallSkeleton)
+ _ORBIT_skel_small_GNOME_Evolution_WombatClient_getPassword);
- }
return _ORBIT_retval;
}
@@ -44,51 +34,35 @@ GNOME_Evolution_WombatClient_forgetPassw
const CORBA_char * key,
CORBA_Environment * ev)
{
- POA_GNOME_Evolution_WombatClient__epv *_ORBIT_epv;
+ gpointer _args[1];
- if (ORBit_small_flags & ORBIT_SMALL_FAST_LOCALS &&
- ORBIT_STUB_IsBypass(_obj, GNOME_Evolution_WombatClient__classid) &&
- (_ORBIT_epv =
- (POA_GNOME_Evolution_WombatClient__epv *) ORBIT_STUB_GetEpv(_obj,
- GNOME_Evolution_WombatClient__classid))->
- forgetPassword) {
- ORBIT_STUB_PreCall(_obj);
- _ORBIT_epv->forgetPassword(ORBIT_STUB_GetServant(_obj), key, ev);
- ORBIT_STUB_PostCall(_obj);
- } else { /* remote marshal */
- gpointer _args[1];
-
- _args[0] = (gpointer) & key;
- ORBit_small_invoke_stub_n(_obj,
- &GNOME_Evolution_WombatClient__iinterface.
- methods, 1, NULL, _args, NULL, ev);
+ _args[0] = (gpointer) & key;
+ ORBit_c_stub_invoke(_obj,
+ &GNOME_Evolution_WombatClient__iinterface.methods, 1,
+ NULL, _args, NULL, ev,
+ GNOME_Evolution_WombatClient__classid,
+ G_STRUCT_OFFSET(POA_GNOME_Evolution_WombatClient__epv,
+ forgetPassword),
+ (ORBitSmallSkeleton)
+ _ORBIT_skel_small_GNOME_Evolution_WombatClient_forgetPassword);
- }
}
+
CORBA_string
GNOME_Evolution_WombatInterfaceCheck__get_interfaceVersion
(GNOME_Evolution_WombatInterfaceCheck _obj, CORBA_Environment * ev)
{
CORBA_string _ORBIT_retval;
- POA_GNOME_Evolution_WombatInterfaceCheck__epv *_ORBIT_epv;
- if (ORBit_small_flags & ORBIT_SMALL_FAST_LOCALS &&
- ORBIT_STUB_IsBypass(_obj,
- GNOME_Evolution_WombatInterfaceCheck__classid)
- && (_ORBIT_epv =
- (POA_GNOME_Evolution_WombatInterfaceCheck__epv *)
- ORBIT_STUB_GetEpv(_obj,
- GNOME_Evolution_WombatInterfaceCheck__classid))->
- _get_interfaceVersion) {
- ORBIT_STUB_PreCall(_obj);
- _ORBIT_retval =
- _ORBIT_epv->_get_interfaceVersion(ORBIT_STUB_GetServant(_obj), ev);
- ORBIT_STUB_PostCall(_obj);
- } else { /* remote marshal */
- ORBit_small_invoke_stub_n(_obj,
- &GNOME_Evolution_WombatInterfaceCheck__iinterface.
- methods, 0, &_ORBIT_retval, NULL, NULL, ev);
+ ORBit_c_stub_invoke(_obj,
+ &GNOME_Evolution_WombatInterfaceCheck__iinterface.
+ methods, 0, &_ORBIT_retval, NULL, NULL, ev,
+ GNOME_Evolution_WombatInterfaceCheck__classid,
+ G_STRUCT_OFFSET
+ (POA_GNOME_Evolution_WombatInterfaceCheck__epv,
+ _get_interfaceVersion),
+ (ORBitSmallSkeleton)
+ _ORBIT_skel_small_GNOME_Evolution_WombatInterfaceCheck__get_interfaceVersion);
- }
return _ORBIT_retval;
}
diff -pNur evolution-1.4.4/wombat/Evolution-Wombat.h evolution-1.4.4.new/wombat/Evolution-Wombat.h
--- evolution-1.4.4/wombat/Evolution-Wombat.h Mon Jun 30 14:22:09 2003
+++ evolution-1.4.4.new/wombat/Evolution-Wombat.h Fri Sep 5 22:06:52 2003
@@ -5,7 +5,7 @@
#ifndef Evolution_Wombat_H
#define Evolution_Wombat_H 1
#include <glib.h>
-#define ORBIT_IDL_SERIAL 19
+#define ORBIT_IDL_SERIAL 20
#include <orbit/orbit-types.h>
#ifdef __cplusplus
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
