+ CORBA_Environment ev;
+ Application *app;
+ Accessibility_Application ref;
+
+ g_return_if_fail (SPI_IS_DESKTOP (desktop));
+
+ spi_desktop_remove_application (desktop, application);
+
+ CORBA_exception_init (&ev);
+
+ ref = bonobo_object_dup_ref (application, &ev);
+
+ if (!BONOBO_EX (&ev))
+ {
+ app = g_new (Application, 1);
+ app->desktop = desktop;
+ app->ref = ref;
+
+ desktop->applications = g_list_append (desktop->applications, app);
+
+ ORBit_small_listen_for_broken (
+ app->ref, G_CALLBACK (abnormal_application_termination), app);
+
+ g_signal_emit (G_OBJECT (desktop),
+ spi_desktop_signals[APPLICATION_ADDED], 0,
+ g_list_index (desktop->applications, app));
+ }
+
+ CORBA_exception_free (&ev);
+}
+
+void
+spi_desktop_remove_application (SpiDesktop *desktop,
+ const Accessibility_Application app_ref)
+{
+ guint idx;
+ GList *l;
+ CORBA_Environment ev;
+
+ g_return_if_fail (app_ref != CORBA_OBJECT_NIL);
+ g_return_if_fail (SPI_IS_DESKTOP (desktop));
+
+ CORBA_exception_init (&ev);
+
+ idx = 0;
+ for (l = desktop->applications; l; l = l->next)
+ {
+ Application *app = (Application *) l->data;
+
+ if (CORBA_Object_is_equivalent (app->ref, app_ref, &ev))
+ {
+ break;
+ }
+ idx++;
+ }
+
+ CORBA_exception_free (&ev);
+
+ if (l)
+ {
+ Application *app = (Application *) l->data;
+
+ desktop->applications = g_list_delete_link (desktop->applications, l);
+
+ ORBit_small_unlisten_for_broken (app->ref, G_CALLBACK (abnormal_application_termination));
+ bonobo_object_release_unref (app->ref, NULL);
+ g_free (app);
+
+ g_signal_emit (G_OBJECT (desktop), spi_desktop_signals[APPLICATION_REMOVED], 0, idx);
+ }