* 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
+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:
2002-03-11 Bill Haneman <bill.haneman@sun.com>
* HACKING:
extern void gnome_accessibility_module_init (void);
extern void gnome_accessibility_module_shutdown (void);
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[])
}
atk_bridge_initialized = TRUE;
}
atk_bridge_initialized = TRUE;
- if (!bonobo_init (argc, *argv))
+ if (!bonobo_init (argc, argv ? *argv : NULL))
{
g_error ("Could not initialize Bonobo");
}
{
g_error ("Could not initialize Bonobo");
}
CORBA_exception_free (&ev);
}
CORBA_exception_free (&ev);
}
- if (CORBA_Object_is_nil (registry, &ev))
+ if (registry == CORBA_OBJECT_NIL)
{
g_error ("Could not locate registry");
}
{
g_error ("Could not locate registry");
}
+int
+gtk_module_init (gint *argc, gchar **argv[])
+{
+ return atk_bridge_init (argc, argv);
+}
+
static gboolean
spi_atk_bridge_idle_init (gpointer user_data)
{
static gboolean
spi_atk_bridge_idle_init (gpointer user_data)
{
void
gnome_accessibility_module_init (void)
{
void
gnome_accessibility_module_init (void)
{
- gtk_module_init (NULL, NULL);
+ atk_bridge_init (NULL, NULL);
g_print("Atk Accessibilty bridge initialized\n");
}
g_print("Atk Accessibilty bridge initialized\n");
}
<oaf_server iid="OAFIID:Accessibility_Registry:proto0.1"
type="exe" location="registryd">
<oaf_attribute name="repo_ids" type="stringv">
<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"/>
<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>
</oaf_server>
</oaf_info>