[patch] use generated objid



OK to commit?

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gconf/ChangeLog,v
retrieving revision 1.262
diff -p -u -r1.262 ChangeLog
--- ChangeLog	2001/07/14 19:58:59	1.262
+++ ChangeLog	2001/07/17 00:02:43
@@ -1,3 +1,8 @@
+2001-07-16  Darin Adler  <darin bentspoon com>
+
+	* gconf/gconf.c: (gconf_postinit):
+	Let oaf generate the ID instead of providing one ourselves.
+
 2001-07-14  Kjartan Maraas  <kmaraas gnome org>

 	* configure.in: Added "nn" to ALL_LINGUAS.
Index: gconf/gconf.c
===================================================================
RCS file: /cvs/gnome/gconf/gconf/gconf.c,v
retrieving revision 1.115
diff -p -u -r1.115 gconf.c
--- gconf/gconf.c	2001/07/13 22:07:37	1.115
+++ gconf/gconf.c	2001/07/17 00:02:45
@@ -2039,7 +2039,7 @@ gconf_postinit(gpointer app, gpointer mo
   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 mo

       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);

===================================================================

    -- Darin




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]