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

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@250 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index 0b52bea..57a7491 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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:

diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c
index 9779cd8..d9b2e71 100644 (file)
--- a/atk-bridge/bridge.c
+++ b/atk-bridge/bridge.c
@@ -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 **argv[])
     }
   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 **argv[])
       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 **argv[])
   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");
 }

diff --git a/registryd/Accessibility_Registry.server.in b/registryd/Accessibility_Registry.server.in
index 5004441..a0a122e 100644 (file)
--- a/registryd/Accessibility_Registry.server.in
+++ b/registryd/Accessibility_Registry.server.in
@@ -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>