static gboolean registry_died = FALSE;
static gboolean atk_listeners_registered = FALSE;
static gint toplevels = 0;
+static gboolean exiting = FALSE;
static guint atk_signal_text_changed;
static guint atk_signal_children_changed;
if (registry_died || (registry == CORBA_OBJECT_NIL)) {
CORBA_exception_init (&ev);
if (registry_died)
- DBG (1, g_warning ("registry died! restarting..."));
-
+ {
+ if (exiting)
+ return CORBA_OBJECT_NIL;
+ else
+ DBG (1, g_warning ("registry died! restarting..."));
+ }
bonobo_activation_set_activation_env_value ("AT_SPI_DISPLAY", spi_display_name ());
registry = bonobo_activation_activate_from_id (
_exit (0);
}
+ exiting = TRUE;
/*
* Check whether we still have windows which have not been deleted.
*/
g_assert (bonobo_activate ());
}
- deregister_application (app);
+ if (!registry_died)
+ deregister_application (app);
DBG (1, g_message ("bridge exit func complete.\n"));
Accessibility_Event e;
SpiAccessible *source;
AtkObject *aobject;
+ Accessibility_Registry registry;
#ifdef SPI_BRIDGE_DEBUG
CORBA_string s;
#endif
CORBA_free (s);
#endif
CORBA_exception_init (&ev);
- Accessibility_Registry_notifyEvent (spi_atk_bridge_get_registry (),
+ registry = spi_atk_bridge_get_registry ();
+ if (registry_died)
+ return;
+
+ Accessibility_Registry_notifyEvent (registry,
&e, &ev);
#ifdef SPI_BRIDGE_DEBUG
if (ev._major != CORBA_NO_EXCEPTION)
if (atk_state_set_contains_state (stateset, ATK_STATE_ACTIVE))
{
spi_atk_emit_eventv (G_OBJECT (child), 0, 0, &any, "window:deactivate");
+ if (registry_died)
+ return;
}
g_object_unref (stateset);