X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=atk-adaptor%2Fbridge.c;h=a1ee202adff10bd4ce56ff4770ce94b8b58f21c7;hp=bd2072700afbc38d502e1d41276add80221f272c;hb=ae83b37cf755efac97974f9acf066fac5f868407;hpb=dd8aee742016d5cc0878098301f336d8420ff228 diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index bd20727..a1ee202 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -22,8 +22,8 @@ * Boston, MA 02111-1307, USA. */ +#define _GNU_SOURCE #include "config.h" -#include "dbus/dbus-glib-lowlevel.h" #include #include @@ -32,26 +32,32 @@ #include #include #include +#include #include #include +#include +#include +#include #include "bridge.h" #include "event.h" #include "adaptors.h" #include "object.h" +#include "accessible-stateset.h" #include "accessible-register.h" #include "accessible-leasing.h" #include "accessible-cache.h" -#include "common/spi-dbus.h" +#include "spi-dbus.h" /*---------------------------------------------------------------------------*/ -SpiBridge *spi_global_app_data = NULL; +static DBusHandlerResult +signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data); -static const AtkMisc *atk_misc = NULL; +SpiBridge *spi_global_app_data = NULL; /*static Display *bridge_display = NULL;*/ @@ -96,92 +102,128 @@ spi_display_name (void) /*---------------------------------------------------------------------------*/ -/* - * Gets the IOR from the XDisplay. - * Not currently used in D-Bus version, but something similar - * may be employed in the future for accessing the registry daemon - * bus name. - */ - -static DBusConnection * -spi_atk_bridge_get_bus (void) +static void +set_reply (DBusPendingCall *pending, void *user_data) { - Atom AT_SPI_BUS; - Atom actual_type; - Display *bridge_display; - int actual_format; - unsigned char *data = NULL; - unsigned long nitems; - unsigned long leftover; - - DBusConnection *bus = NULL; - DBusError error; - - bridge_display = XOpenDisplay (spi_display_name ()); - if (!bridge_display) - g_error ("AT_SPI: Could not get the display\n"); + void **replyptr = (void **)user_data; - AT_SPI_BUS = XInternAtom (bridge_display, "AT_SPI_BUS", False); - XGetWindowProperty (bridge_display, - XDefaultRootWindow (bridge_display), - AT_SPI_BUS, 0L, - (long) BUFSIZ, False, - (Atom) 31, &actual_type, &actual_format, - &nitems, &leftover, &data); + *replyptr = dbus_pending_call_steal_reply (pending); + dbus_pending_call_unref (pending); +} - dbus_error_init (&error); +/*---------------------------------------------------------------------------*/ - if (data == NULL) - { - g_warning - ("AT-SPI: Accessibility bus not found - Using session bus.\n"); - bus = dbus_bus_get (DBUS_BUS_SESSION, &error); - if (!bus) - g_error ("AT-SPI: Couldn't connect to bus: %s\n", error.message); - } - else +static void +add_event (const char *bus_name, const char *event) +{ + event_data *evdata; + gchar **data; + GList *new_list; + + spi_atk_add_client (bus_name); + evdata = (event_data *) g_malloc (sizeof (*evdata)); + if (!evdata) + return; + data = g_strsplit (event, ":", 3); + if (!data) { - bus = dbus_connection_open (data, &error); - if (!bus) - { - g_error ("AT-SPI: Couldn't connect to bus: %s\n", error.message); - } - else - { - if (!dbus_bus_register (bus, &error)) - g_error ("AT-SPI: Couldn't register with bus: %s\n", error.message); - } + g_free (evdata); + return; } - - return bus; + evdata->bus_name = g_strdup (bus_name); + evdata->data = data; + new_list = g_list_append (spi_global_app_data->events, evdata); + if (new_list) + spi_global_app_data->events = new_list; } +static GSList *clients = NULL; + static void -set_reply (DBusPendingCall *pending, void *user_data) +get_registered_event_listeners (SpiBridge *app) { - void **replyptr = (void **)user_data; + DBusMessage *message, *reply; + DBusMessageIter iter, iter_array, iter_struct; - *replyptr = dbus_pending_call_steal_reply (pending); + message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, + ATSPI_DBUS_PATH_REGISTRY, + ATSPI_DBUS_INTERFACE_REGISTRY, + "GetRegisteredEvents"); + if (!message) + return; + + reply = dbus_connection_send_with_reply_and_block (app->bus, message, 5000, NULL); + dbus_message_unref (message); + if (!reply) + { + spi_global_app_data->events_initialized = TRUE; + return; + } + if (strcmp (dbus_message_get_signature (reply), "a(ss)") != 0) + { + g_warning ("atk-bridge: GetRegisteredEvents returned message with unknown signature"); + dbus_message_unref (reply); + spi_global_app_data->events_initialized = TRUE; + return; + } + dbus_message_iter_init (reply, &iter); + dbus_message_iter_recurse (&iter, &iter_array); + while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) + { + char *bus_name, *event; + dbus_message_iter_recurse (&iter_array, &iter_struct); + dbus_message_iter_get_basic (&iter_struct, &bus_name); + dbus_message_iter_next (&iter_struct); + dbus_message_iter_get_basic (&iter_struct, &event); + add_event (bus_name, event); + dbus_message_iter_next (&iter_array); + } + dbus_message_unref (reply); + + if (!clients) + spi_atk_deregister_event_listeners (); + spi_global_app_data->events_initialized = TRUE; } -static DBusMessage * -send_and_allow_reentry (DBusConnection *bus, DBusMessage *message, DBusError *error) +static void +register_reply (DBusPendingCall *pending, void *user_data) { - DBusPendingCall *pending; - DBusMessage *reply = NULL; + DBusMessage *reply; + SpiBridge *app = user_data; + DBusMessage *message; - if (!dbus_connection_send_with_reply (bus, message, &pending, -1)) + reply = dbus_pending_call_steal_reply (pending); + dbus_pending_call_unref (pending); + if (reply) { - return NULL; + gchar *app_name, *obj_path; + + if (strcmp (dbus_message_get_signature (reply), "(so)") != 0) + { + g_warning ("AT-SPI: Could not obtain desktop path or name\n"); + } + else + { + DBusMessageIter iter, iter_struct; + dbus_message_iter_init (reply, &iter); + dbus_message_iter_recurse (&iter, &iter_struct); + dbus_message_iter_get_basic (&iter_struct, &app_name); + dbus_message_iter_next (&iter_struct); + dbus_message_iter_get_basic (&iter_struct, &obj_path); + + app->desktop_name = g_strdup (app_name); + app->desktop_path = g_strdup (obj_path); + } } - dbus_pending_call_set_notify (pending, set_reply, (void *)&reply, NULL); - while (!reply) + else { - if (!dbus_connection_read_write_dispatch (bus, -1)) return NULL; + g_warning ("AT-SPI: Could not embed inside desktop"); + return; } - return reply; + dbus_message_unref (reply); + + get_registered_event_listeners (spi_global_app_data); } -/*---------------------------------------------------------------------------*/ static gboolean register_application (SpiBridge * app) @@ -189,47 +231,47 @@ register_application (SpiBridge * app) DBusMessage *message, *reply; DBusMessageIter iter; DBusError error; + DBusPendingCall *pending; + const int max_addr_length = 128; /* should be long enough */ dbus_error_init (&error); + /* These will be overridden when we get a reply, but in practice these + defaults should always be correct */ + app->desktop_name = ATSPI_DBUS_NAME_REGISTRY; + app->desktop_path = ATSPI_DBUS_PATH_ROOT; + message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, - SPI_DBUS_PATH_ROOT, - SPI_DBUS_INTERFACE_SOCKET, + ATSPI_DBUS_PATH_ROOT, + ATSPI_DBUS_INTERFACE_SOCKET, "Embed"); dbus_message_iter_init_append (message, &iter); spi_object_append_reference (&iter, app->root); - reply = send_and_allow_reentry (app->bus, message, &error); + if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1) + || !pending) + { + return FALSE; + } + + dbus_pending_call_set_notify (pending, register_reply, app, NULL); if (message) dbus_message_unref (message); - if (reply) - { - DBusMessageIter iter, iter_struct; - gchar *app_name, *obj_path; - - if (strcmp (dbus_message_get_signature (reply), "(so)") != 0) - { - g_warning ("AT-SPI: Could not obtain desktop path or name\n"); - return FALSE; - } - - dbus_message_iter_init (reply, &iter); - dbus_message_iter_recurse (&iter, &iter_struct); - dbus_message_iter_get_basic (&iter_struct, &app_name); - dbus_message_iter_next (&iter_struct); - dbus_message_iter_get_basic (&iter_struct, &obj_path); + /* could this be better, we accept some amount of race in getting the temp name*/ + /* make sure the directory exists */ + mkdir ("/tmp/at-spi2/", S_IRWXU|S_IRWXG|S_IRWXO|S_ISVTX); + chmod ("/tmp/at-spi2/", S_IRWXU|S_IRWXG|S_IRWXO|S_ISVTX); + app->app_bus_addr = g_malloc(max_addr_length * sizeof(char)); +#ifndef DISABLE_P2P + sprintf (app->app_bus_addr, "unix:path=/tmp/at-spi2/socket-%d-%d", getpid(), + rand()); +#else + app->app_bus_addr [0] = '\0'; +#endif - app->desktop_name = g_strdup (app_name); - app->desktop_path = g_strdup (obj_path); - } - else - { - g_warning ("AT-SPI: Could not embed inside desktop: %s\n", error.message); - return FALSE; - } return TRUE; } @@ -246,8 +288,8 @@ deregister_application (SpiBridge * app) dbus_error_init (&error); message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, - SPI_DBUS_PATH_REGISTRY, - SPI_DBUS_INTERFACE_REGISTRY, + ATSPI_DBUS_PATH_REGISTRY, + ATSPI_DBUS_INTERFACE_REGISTRY, "DeregisterApplication"); dbus_message_set_no_reply (message, TRUE); @@ -262,28 +304,6 @@ deregister_application (SpiBridge * app) /*---------------------------------------------------------------------------*/ -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; @@ -302,11 +322,71 @@ get_plug_id (AtkPlug * plug) return g_string_free (str, FALSE); } +AtkStateSet * +socket_ref_state_set (AtkObject *accessible) +{ + char *child_name, *child_path; + AtkSocket *socket = ATK_SOCKET (accessible); + int count = 0; + int j; + int v; + DBusMessage *message, *reply; + DBusMessageIter iter, iter_array; + AtkStateSet *set; + + set = atk_state_set_new (); + + if (!socket->embedded_plug_id) + return set; + + child_name = g_strdup (socket->embedded_plug_id); + if (!child_name) + return set; + child_path = g_utf8_strchr (child_name + 1, -1, ':'); + if (!child_path) + { + g_free (child_name); + return set; + } + *(child_path++) = '\0'; + message = dbus_message_new_method_call (child_name, child_path, ATSPI_DBUS_INTERFACE_ACCESSIBLE, "GetState"); + g_free (child_name); + reply = dbus_connection_send_with_reply_and_block (spi_global_app_data->bus, message, 1, NULL); + dbus_message_unref (message); + if (reply == NULL) + return set; + if (strcmp (dbus_message_get_signature (reply), "au") != 0) + { + dbus_message_unref (reply); + return set; + } + + dbus_message_iter_init (reply, &iter); + dbus_message_iter_recurse (&iter, &iter_array); + do + { + dbus_message_iter_get_basic (&iter_array, &v); + for (j = 0; j < 32; j++) + { + if (v & (1 << j)) + { + AtkState state = spi_atk_state_from_spi_state ((count << 5) + j); + atk_state_set_add_state (set, state); + } + } + count++; + } + while (dbus_message_iter_next (&iter_array)); + dbus_message_unref (reply); + return set; +} + static void socket_embed_hook (AtkSocket * socket, gchar * plug_id) { AtkObject *accessible = ATK_OBJECT(socket); gchar *plug_name, *plug_path; + AtkObjectClass *klass; /* Force registration */ gchar *path = spi_register_object_to_path (spi_global_register, G_OBJECT (accessible)); @@ -322,12 +402,15 @@ socket_embed_hook (AtkSocket * socket, gchar * plug_id) { DBusMessage *message; *(plug_path++) = '\0'; - message = dbus_message_new_method_call (plug_name, plug_path, SPI_DBUS_INTERFACE_SOCKET, "Embedded"); + message = dbus_message_new_method_call (plug_name, plug_path, ATSPI_DBUS_INTERFACE_SOCKET, "Embedded"); dbus_message_append_args (message, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID); dbus_connection_send (spi_global_app_data->bus, message, NULL); } g_free (plug_name); g_free (path); + + klass = ATK_OBJECT_GET_CLASS (accessible); + klass->ref_state_set = socket_ref_state_set; } static void @@ -343,6 +426,91 @@ install_plug_hooks () socket_class->embed = socket_embed_hook; } +static uint +get_ancestral_uid (uint pid) +{ + FILE *fp; + char buf [80]; + int ppid = 0; + int uid = 0; + gboolean got_ppid = 0; + gboolean got_uid = 0; + + sprintf (buf, "/proc/%d/status", pid); + fp = fopen (buf, "r"); + if (!fp) + return 0; + while ((!got_ppid || !got_uid) && fgets (buf, sizeof (buf), fp)) + { + if (sscanf (buf, "PPid:\t%d", &ppid) == 1) + got_ppid = TRUE; + else if (sscanf (buf, "Uid:\t%d", &uid) == 1) + got_uid = TRUE; + } + fclose (fp); + + if (!got_ppid || !got_uid) + return 0; + if (uid != 0) + return uid; + if (ppid == 0 || ppid == 1) + return 0; + return get_ancestral_uid (ppid); +} + +static dbus_bool_t +user_check (DBusConnection *bus, unsigned long uid) +{ + if (uid == getuid () || uid == geteuid ()) + return TRUE; + if (getuid () == 0) + return get_ancestral_uid (getpid ()) == uid; + return FALSE; +} + +static void +new_connection_cb (DBusServer *server, DBusConnection *con, void *data) +{ + GList *new_list; + + dbus_connection_set_unix_user_function (con, user_check, NULL, NULL); + dbus_connection_ref(con); + atspi_dbus_connection_setup_with_g_main(con, NULL); + droute_intercept_dbus (con); + droute_context_register (spi_global_app_data->droute, con); + + spi_global_app_data->direct_connections = g_list_append (spi_global_app_data->direct_connections, con); +} + +static int +setup_bus (void) +{ +#ifndef DISABLE_P2P + DBusServer *server; + DBusError err; + + dbus_error_init(&err); + server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err); + if (server == NULL) + { + g_warning (_("atk-bridge: Couldn't listen on dbus server: %s"), err.message); + dbus_error_init (&err); + spi_global_app_data->app_bus_addr [0] = '\0'; + g_main_context_unref (spi_global_app_data->main_context); + spi_global_app_data->main_context = NULL; + return -1; + } + + atspi_dbus_server_setup_with_g_main(server, NULL); + dbus_server_set_new_connection_function(server, new_connection_cb, NULL, NULL); + + spi_global_app_data->server = server; +#endif + + return 0; +} + + gchar *atspi_dbus_name = NULL; static gboolean atspi_no_register = FALSE; @@ -354,6 +522,121 @@ static GOptionEntry atspi_option_entries[] = { {NULL} }; +static gchar * +introspect_children_cb (const char *path, void *data) +{ + if (!strcmp (path, "/org/a11y/atspi/accessible")) + { + return g_strdup ("\n"); + /* TODO: Should we place the whole hierarchy here? */ + } + return NULL; +} + +static void +handle_event_listener_registered (DBusConnection *bus, DBusMessage *message, + void *user_data) +{ + const char *name; + char *sender; + + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &sender, + DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) + return; + + add_event (sender, name); +} + +static void +remove_events (const char *bus_name, const char *event) +{ + event_data *evdata; + gchar **remove_data; + GList *list; + + remove_data = g_strsplit (event, ":", 3); + if (!remove_data) + { + return; + } + + for (list = spi_global_app_data->events; list;) + { + event_data *evdata = list->data; + if (!g_strcmp0 (evdata->bus_name, bus_name) && + spi_event_is_subtype (evdata->data, remove_data)) + { + GList *events = spi_global_app_data->events; + list = list->next; + g_strfreev (evdata->data); + g_free (evdata->bus_name); + g_free (evdata); + spi_global_app_data->events = g_list_remove (events, evdata); + } + else + { + list = list->next; + } + } + + g_strfreev (remove_data); +} + +static void +handle_event_listener_deregistered (DBusConnection *bus, DBusMessage *message, + void *user_data) +{ + const char *orig_name; + gchar *name; + char *sender; + + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &sender, + DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) + return; + + remove_events (sender, name); +} + +static DBusHandlerResult +signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) +{ + const char *interface = dbus_message_get_interface (message); + const char *member = dbus_message_get_member (message); + DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + + if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + + if (!strcmp (interface, ATSPI_DBUS_INTERFACE_REGISTRY)) + { + result = DBUS_HANDLER_RESULT_HANDLED; + if (!strcmp (member, "EventListenerRegistered")) + handle_event_listener_registered (bus, message, user_data); + else if (!strcmp (member, "EventListenerDeregistered")) + handle_event_listener_deregistered (bus, message, user_data); + else + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + + if (!g_strcmp0(interface, DBUS_INTERFACE_DBUS) && + !g_strcmp0(member, "NameOwnerChanged")) + { + char *name, *old, *new; + result = DBUS_HANDLER_RESULT_HANDLED; + if (dbus_message_get_args (message, NULL, + DBUS_TYPE_STRING, &name, + DBUS_TYPE_STRING, &old, + DBUS_TYPE_STRING, &new, + DBUS_TYPE_INVALID)) + { + if (*old != '\0' && *new == '\0') + spi_atk_remove_client (old); + } + } + + return result; +} + /* * spi_app_init * @@ -361,6 +644,7 @@ static GOptionEntry atspi_option_entries[] = { * * - DRoute for routing message to their accessible objects. * - Event handlers for emmitting signals on specific ATK events. + * - setup the bus for p2p communication * - Application registration with the AT-SPI registry. * */ @@ -370,7 +654,6 @@ adaptor_init (gint * argc, gchar ** argv[]) GOptionContext *opt; GError *err = NULL; DBusError error; - DBusConnection *bus; AtkObject *root; gchar *introspection_directory; static gboolean inited = FALSE; @@ -383,7 +666,12 @@ adaptor_init (gint * argc, gchar ** argv[]) DRoutePath *treepath, *accpath; root = atk_get_root (); - g_return_val_if_fail (root, 0); + g_warn_if_fail (root); + if (!root) + { + inited = FALSE; + return -1; + } /* Parse command line options */ opt = g_option_context_new (NULL); @@ -391,20 +679,21 @@ adaptor_init (gint * argc, gchar ** argv[]) g_option_context_set_ignore_unknown_options (opt, TRUE); if (!g_option_context_parse (opt, argc, argv, &err)) g_warning ("AT-SPI Option parsing failed: %s\n", err->message); + g_option_context_free (opt); /* Allocate global data and do ATK initializations */ spi_global_app_data = g_new0 (SpiBridge, 1); - atk_misc = atk_misc_get_instance (); spi_global_app_data->root = g_object_ref (root); /* Set up D-Bus connection and register bus name */ dbus_error_init (&error); - spi_global_app_data->bus = spi_atk_bridge_get_bus (); + spi_global_app_data->bus = atspi_get_a11y_bus (); if (!spi_global_app_data->bus) { g_free (spi_global_app_data); spi_global_app_data = NULL; - return 0; + inited = FALSE; + return -1; } if (atspi_dbus_name != NULL) @@ -422,8 +711,9 @@ adaptor_init (gint * argc, gchar ** argv[]) } } - dbus_connection_setup_with_g_main (spi_global_app_data->bus, - g_main_context_default ()); + spi_global_app_data->main_context = g_main_context_new (); + + atspi_dbus_connection_setup_with_g_main (spi_global_app_data->bus, NULL); /* Hook our plug-and socket functions */ install_plug_hooks (); @@ -439,20 +729,22 @@ adaptor_init (gint * argc, gchar ** argv[]) /* Register droute for routing AT-SPI messages */ spi_global_app_data->droute = - droute_new (spi_global_app_data->bus); + droute_new (); treepath = droute_add_one (spi_global_app_data->droute, - "/org/at_spi/cache", spi_global_cache); + "/org/a11y/atspi/cache", spi_global_cache); if (!treepath) { g_warning ("atk-bridge: Error in droute_add_one(). Already running?"); - return 0; + return -1; } accpath = droute_add_many (spi_global_app_data->droute, "/org/a11y/atspi/accessible", NULL, + introspect_children_cb, + NULL, (DRouteGetDatumFunction) spi_global_register_path_to_object); @@ -475,14 +767,24 @@ adaptor_init (gint * argc, gchar ** argv[]) spi_initialize_text (accpath); spi_initialize_value (accpath); + droute_context_register (spi_global_app_data->droute, + spi_global_app_data->bus); + /* Register methods to send D-Bus signals on certain ATK events */ spi_atk_register_event_listeners (); + /* Set up filter and match rules to catch signals */ + dbus_bus_add_match (spi_global_app_data->bus, "type='signal', interface='org.a11y.atspi.Registry', sender='org.a11y.atspi.Registry'", NULL); + dbus_connection_add_filter (spi_global_app_data->bus, signal_filter, NULL, + NULL); + /* Register this app by sending a signal out to AT-SPI registry daemon */ if (!atspi_no_register && (!root || !ATK_IS_PLUG (root))) register_application (spi_global_app_data); + else + get_registered_event_listeners (spi_global_app_data); - g_atexit (exit_func); + setup_bus(); return 0; } @@ -501,6 +803,14 @@ gtk_module_init (gint * argc, gchar ** argv[]) return 0; } +gchar* +g_module_check_init (GModule *module) +{ + g_module_make_resident (module); + + return NULL; +} + void gnome_accessibility_module_init (void) { @@ -520,8 +830,95 @@ gnome_accessibility_module_init (void) 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 = + "type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged', arg0='%s'"; + +void +spi_atk_add_client (const char *bus_name) +{ + GSList *l; + gchar *match; + + for (l = clients; l; l = l->next) + { + if (!g_strcmp0 (l->data, bus_name)) + return; + } + if (!clients && spi_global_app_data->events_initialized) + spi_atk_register_event_listeners (); + clients = g_slist_append (clients, g_strdup (bus_name)); + match = g_strdup_printf (name_match_tmpl, bus_name); + dbus_bus_add_match (spi_global_app_data->bus, match, NULL); + g_free (match); +} + +void +spi_atk_remove_client (const char *bus_name) +{ + GSList *l; + + for (l = clients; l; l = l->next) + { + if (!g_strcmp0 (l->data, bus_name)) + { + gchar *match = g_strdup_printf (name_match_tmpl, l->data); + dbus_bus_remove_match (spi_global_app_data->bus, match, NULL); + g_free (match); + g_free (l->data); + clients = g_slist_remove_link (clients, l); + if (!clients) + spi_atk_deregister_event_listeners (); + } + } } /*END------------------------------------------------------------------------*/