diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-07-17 17:21:46 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-07-17 17:21:46 +0000 |
| commit | 239e6f7e629b8a754567d269b6cde4139d457544 (patch) | |
| tree | ad7ad543bb2d7336bf52837ddf31b663c1a88a65 | |
| parent | c8f01ffcd0760b594d86c6b4325caf85d3b1ce45 (diff) | |
| download | gconf-239e6f7e629b8a754567d269b6cde4139d457544.tar.gz | |
Let CORBA generate the ID instead of providing one ourselves.
* gconf/gconf.c: (gconf_postinit):
Let CORBA generate the ID instead of providing one ourselves.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gconf/gconf.c | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2001-07-17 Darin Adler <darin@bentspoon.com> + + * gconf/gconf.c: (gconf_postinit): + Let CORBA generate the ID instead of providing one ourselves. + 2001-07-17 Laszlo Peter <laca@ireland.sun.com> * gconf/Makefile.am: remove the -Wno-unused flag; not portable. diff --git a/gconf/gconf.c b/gconf/gconf.c index 249677a2..c8e1c70a 100644 --- a/gconf/gconf.c +++ b/gconf/gconf.c @@ -2039,7 +2039,7 @@ gconf_postinit(gpointer app, gpointer mod_info) if (listener == CORBA_OBJECT_NIL) { CORBA_Environment ev; - PortableServer_ObjectId objid = {0, sizeof("ConfigListener"), "ConfigListener"}; + PortableServer_ObjectId* objid; PortableServer_POA poa; CORBA_exception_init(&ev); @@ -2055,8 +2055,7 @@ gconf_postinit(gpointer app, gpointer mod_info) g_assert (ev._major == CORBA_NO_EXCEPTION); - PortableServer_POA_activate_object_with_id(poa, - &objid, &poa_listener_servant, &ev); + objid = PortableServer_POA_activate_object(poa, &poa_listener_servant, &ev); g_assert (ev._major == CORBA_NO_EXCEPTION); |