/*---------------------------------------------------------------------------*/
+static DBusHandlerResult
+signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data);
+
SpiBridge *spi_global_app_data = NULL;
/*static Display *bridge_display = NULL;*/
/*---------------------------------------------------------------------------*/
-static void
-exit_func (void)
-{
- if (!spi_global_app_data)
- {
- return;
- }
-
- spi_atk_tidy_windows ();
- spi_atk_deregister_event_listeners ();
- deregister_application (spi_global_app_data);
-
- g_free (spi_global_app_data);
- spi_global_app_data = NULL;
-
- /* Not currently creating an XDisplay */
-#if 0
- if (bridge_display)
- XCloseDisplay (bridge_display);
-#endif
-}
-
/*---------------------------------------------------------------------------*/
static AtkPlugClass *plug_class;
DBusMessageIter iter, iter_array;
AtkStateSet *set;
+ set = atk_state_set_new ();
+
if (!socket->embedded_plug_id)
- return NULL;
+ return set;
child_name = g_strdup (socket->embedded_plug_id);
if (!child_name)
- return NULL;
+ return set;
child_path = g_utf8_strchr (child_name + 1, -1, ':');
if (!child_path)
{
g_free (child_name);
- return NULL;
+ return set;
}
*(child_path++) = '\0';
message = dbus_message_new_method_call (child_name, child_path, ATSPI_DBUS_INTERFACE_ACCESSIBLE, "GetState");
reply = dbus_connection_send_with_reply_and_block (spi_global_app_data->bus, message, 1, NULL);
dbus_message_unref (message);
if (reply == NULL)
- return NULL;
+ return set;
if (strcmp (dbus_message_get_signature (reply), "au") != 0)
{
dbus_message_unref (reply);
- return NULL;
+ return set;
}
- set = atk_state_set_new ();
- if (!set)
- return NULL;
+
dbus_message_iter_init (reply, &iter);
dbus_message_iter_recurse (&iter, &iter_array);
do
droute_intercept_dbus (con);
droute_context_register (spi_global_app_data->droute, con);
- new_list = g_list_append (spi_global_app_data->direct_connections, con);
- if (new_list)
- spi_global_app_data->direct_connections = new_list;
+ spi_global_app_data->direct_connections = g_list_append (spi_global_app_data->direct_connections, con);
}
static int
void
gnome_accessibility_module_shutdown (void)
{
+ GList *l;
+
+ if (!spi_global_app_data)
+ return;
+
+ spi_atk_tidy_windows ();
spi_atk_deregister_event_listeners ();
- exit_func ();
+
+ deregister_application (spi_global_app_data);
+
+ if (spi_global_app_data->bus)
+ {
+ dbus_connection_remove_filter (spi_global_app_data->bus, signal_filter, NULL);
+ droute_context_unregister (spi_global_app_data->droute, spi_global_app_data->bus);
+ dbus_connection_unref (spi_global_app_data->bus);
+ }
+
+ for (l = spi_global_app_data->direct_connections; l; l = l->next)
+ {
+ droute_context_unregister (spi_global_app_data->droute, l->data);
+ droute_unintercept_dbus (l->data);
+ dbus_connection_unref (l);
+ }
+ g_list_free (spi_global_app_data->direct_connections);
+
+ for (l = clients; l; l = l->next)
+ g_free (l->data);
+ g_list_free (clients);
+ clients = NULL;
+
+ g_object_unref (spi_global_cache);
+ g_object_unref (spi_global_leasing);
+ g_object_unref (spi_global_register);
+
+ if (spi_global_app_data->main_context)
+ g_main_context_unref (spi_global_app_data->main_context);
+
+ droute_free (spi_global_app_data->droute);
+
+ g_free (spi_global_app_data);
+ spi_global_app_data = NULL;
+
+ /* Not currently creating an XDisplay */
+#if 0
+ if (bridge_display)
+ XCloseDisplay (bridge_display);
+#endif
}
static gchar *name_match_tmpl =