[g-a-devel]at-spi bridge patch ...

[Michael Meeks <michael ximian com>]

Hi Bill,

	It turns out there was some bit-rot and oddness going on in the bridge,
this patch fixes it and makes it work with the gnome-program stuff I've
just committed. Hooks for libgail-gnome to follow.

	May I commit ?

		Michael.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/at-spi/ChangeLog,v
retrieving revision 1.165
diff -u -p -u -r1.165 ChangeLog
--- ChangeLog	11 Mar 2002 22:36:01 -0000	1.165
+++ ChangeLog	13 Mar 2002 15:07:14 -0000
@@ -1,3 +1,10 @@
+2002-03-13  Michael Meeks  <michael ximian com>
+
+	* atk-bridge/bridge.c (gtk_module_init): split
+	out body to (atk_bridge_init): here, since otherwise
+	we get symbol conflicts and oddness when invoked
+	from (gnome_accessibility_module_init): here (upd.)
+
 2002-03-11  Bill Haneman  <bill haneman sun com>
 
 	* HACKING:
Index: atk-bridge/bridge.c
===================================================================
RCS file: /cvs/gnome/at-spi/atk-bridge/bridge.c,v
retrieving revision 1.30
diff -u -p -u -r1.30 bridge.c
--- atk-bridge/bridge.c	4 Feb 2002 19:49:47 -0000	1.30
+++ atk-bridge/bridge.c	13 Mar 2002 15:07:14 -0000
@@ -70,8 +70,8 @@ static GArray *listener_ids = NULL;
 extern void gnome_accessibility_module_init     (void);
 extern void gnome_accessibility_module_shutdown (void);
 
-int
-gtk_module_init (gint *argc, gchar **argv[])
+static int
+atk_bridge_init (gint *argc, gchar **argv[])
 {
   CORBA_Environment ev;
 
@@ -81,7 +81,7 @@ gtk_module_init (gint *argc, gchar **arg
     }
   atk_bridge_initialized = TRUE;
 
-  if (!bonobo_init (argc, *argv))
+  if (!bonobo_init (argc, argv ? *argv : NULL))
     {
       g_error ("Could not initialize Bonobo");
     }
@@ -99,7 +99,7 @@ gtk_module_init (gint *argc, gchar **arg
       CORBA_exception_free (&ev);
     }
 
-  if (CORBA_Object_is_nil (registry, &ev))
+  if (registry == CORBA_OBJECT_NIL)
     {
       g_error ("Could not locate registry");
     }
@@ -123,6 +123,12 @@ gtk_module_init (gint *argc, gchar **arg
   return 0;
 }
 
+int
+gtk_module_init (gint *argc, gchar **argv[])
+{
+	return atk_bridge_init (argc, argv);
+}
+
 static gboolean
 spi_atk_bridge_idle_init (gpointer user_data)
 {
@@ -242,7 +248,7 @@ spi_atk_bridge_exit_func (void)
 void
 gnome_accessibility_module_init (void)
 {
-  gtk_module_init (NULL, NULL);
+  atk_bridge_init (NULL, NULL);
 
   g_print("Atk Accessibilty bridge initialized\n");
 }
Index: registryd/Accessibility_Registry.server.in
===================================================================
RCS file: /cvs/gnome/at-spi/registryd/Accessibility_Registry.server.in,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 Accessibility_Registry.server.in
--- registryd/Accessibility_Registry.server.in	25 Jul 2001 18:26:39 -0000	1.1.1.1
+++ registryd/Accessibility_Registry.server.in	13 Mar 2002 15:07:14 -0000
@@ -2,9 +2,11 @@
 	<oaf_server iid="OAFIID:Accessibility_Registry:proto0.1"
         	    type="exe" location="registryd">
 		<oaf_attribute name="repo_ids" type="stringv">
+			<item value="IDL:Bonobo/Unknown:1.0"/>
 			<item value="IDL:Accessibility/Registry:1.0"/>
 		</oaf_attribute>
 		<oaf_attribute name="name" type="string" value="AT-SPI Registry"/>
-		<oaf_attribute name="description" type="string" value="Accessibility Registry"/>
+		<oaf_attribute name="description" type="string"
+		 value="Accessibility Registry"/>
 	</oaf_server>
 </oaf_info>

-- 
 mmeeks gnu org  <><, Pseudo Engineer, itinerant idiot