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=96fdbf9d19df102d7ff743f072eb020ce94f0530;hp=6aacd121e9d7b01344260274c046fdbc3b433dcf;hb=3cdd2ef552996044c51109415384ee043e2f2c57;hpb=d0f7dd49eebedc8c3993a116411f5a8320965968 diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index 6aacd12..96fdbf9 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -25,8 +25,6 @@ #define _GNU_SOURCE #include "config.h" -#include -#include #include #include #include @@ -36,77 +34,29 @@ #include #include -#include -#include #include +#include #include "bridge.h" #include "event.h" #include "adaptors.h" #include "object.h" -#include "common/spi-stateset.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 Display *bridge_display = NULL;*/ - -/*---------------------------------------------------------------------------*/ - -/* - * Returns a 'canonicalized' value for DISPLAY, - * with the screen number stripped off if present. - * - */ -static const gchar * -spi_display_name (void) -{ - static const char *canonical_display_name = NULL; - if (!canonical_display_name) - { - const gchar *display_env = g_getenv ("AT_SPI_DISPLAY"); - if (!display_env) - { - display_env = g_getenv ("DISPLAY"); - if (!display_env || !display_env[0]) - canonical_display_name = ":0"; - else - { - gchar *display_p, *screen_p; - canonical_display_name = g_strdup (display_env); - display_p = strrchr (canonical_display_name, ':'); - screen_p = strrchr (canonical_display_name, '.'); - if (screen_p && display_p && (screen_p > display_p)) - { - *screen_p = '\0'; - } - } - } - else - { - canonical_display_name = display_env; - } - } - return canonical_display_name; -} - -/*---------------------------------------------------------------------------*/ +static DBusHandlerResult +signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data); -static void -set_reply (DBusPendingCall *pending, void *user_data) -{ - void **replyptr = (void **)user_data; +SpiBridge *spi_global_app_data = NULL; - *replyptr = dbus_pending_call_steal_reply (pending); - dbus_pending_call_unref (pending); -} +static gboolean inited = FALSE; /*---------------------------------------------------------------------------*/ @@ -115,7 +65,6 @@ 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)); @@ -129,40 +78,40 @@ add_event (const char *bus_name, const char *event) } 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; + spi_global_app_data->events = g_list_append (spi_global_app_data->events, evdata); } static GSList *clients = NULL; static void -get_registered_event_listeners (SpiBridge *app) +tally_event_reply () { - DBusMessage *message, *reply; - DBusMessageIter iter, iter_array, iter_struct; + static int replies_received = 0; - message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, - SPI_DBUS_PATH_REGISTRY, - SPI_DBUS_INTERFACE_REGISTRY, - "GetRegisteredEvents"); - if (!message) - return; + replies_received++; + if (replies_received == 3) + { + if (!clients) + spi_atk_deregister_event_listeners (); + spi_global_app_data->events_initialized = TRUE; + } +} + +static void +get_events_reply (DBusPendingCall *pending, void *user_data) +{ + DBusMessage *reply = dbus_pending_call_steal_reply (pending); + DBusMessageIter iter, iter_array, iter_struct; - 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; - } + goto done; + 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; + goto done; } + 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) @@ -175,11 +124,104 @@ get_registered_event_listeners (SpiBridge *app) 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; +done: + if (reply) + dbus_message_unref (reply); + if (pending) + dbus_pending_call_unref (pending); + + tally_event_reply (); +} + +static void +get_device_events_reply (DBusPendingCall *pending, void *user_data) +{ + DBusMessage *reply = dbus_pending_call_steal_reply (pending); + DBusMessageIter iter, iter_array, iter_struct; + + if (!reply) + goto done; + + if (strncmp (dbus_message_get_signature (reply), "a(s", 3) != 0) + { + g_warning ("atk-bridge: get_device_events_reply: unknown signature"); + goto done; + } + + 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; + dbus_message_iter_recurse (&iter_array, &iter_struct); + dbus_message_iter_get_basic (&iter_struct, &bus_name); + spi_atk_add_client (bus_name); + dbus_message_iter_next (&iter_array); + } + +done: + if (reply) + dbus_message_unref (reply); + if (pending) + dbus_pending_call_unref (pending); + + tally_event_reply (); +} + +static void +get_registered_event_listeners (SpiBridge *app) +{ + DBusMessage *message; + DBusPendingCall *pending = NULL; + + message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, + ATSPI_DBUS_PATH_REGISTRY, + ATSPI_DBUS_INTERFACE_REGISTRY, + "GetRegisteredEvents"); + if (!message) + return; + + dbus_connection_send_with_reply (app->bus, message, &pending, -1); + dbus_message_unref (message); + if (!pending) + { + spi_global_app_data->events_initialized = TRUE; + return; + } + dbus_pending_call_set_notify (pending, get_events_reply, NULL, NULL); + + message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, + ATSPI_DBUS_PATH_DEC, + ATSPI_DBUS_INTERFACE_DEC, + "GetKeystrokeListeners"); + if (!message) + return; + pending = NULL; + dbus_connection_send_with_reply (app->bus, message, &pending, -1); + dbus_message_unref (message); + if (!pending) + { + spi_global_app_data->events_initialized = TRUE; + return; + } + dbus_pending_call_set_notify (pending, get_device_events_reply, NULL, NULL); + + message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, + ATSPI_DBUS_PATH_DEC, + ATSPI_DBUS_INTERFACE_DEC, + "GetDeviceEventListeners"); + if (!message) + return; + pending = NULL; + dbus_connection_send_with_reply (app->bus, message, &pending, -1); + dbus_message_unref (message); + if (!pending) + { + spi_global_app_data->events_initialized = TRUE; + return; + } + dbus_pending_call_set_notify (pending, get_device_events_reply, NULL, NULL); } static void @@ -187,7 +229,6 @@ register_reply (DBusPendingCall *pending, void *user_data) { DBusMessage *reply; SpiBridge *app = user_data; - DBusMessage *message; reply = dbus_pending_call_steal_reply (pending); dbus_pending_call_unref (pending); @@ -225,22 +266,21 @@ register_reply (DBusPendingCall *pending, void *user_data) static gboolean register_application (SpiBridge * app) { - DBusMessage *message, *reply; + DBusMessage *message; 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 = SPI_DBUS_NAME_REGISTRY; - app->desktop_path = SPI_DBUS_PATH_ROOT; + 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); @@ -257,18 +297,6 @@ register_application (SpiBridge * app) if (message) dbus_message_unref (message); - /* 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 - return TRUE; } @@ -285,8 +313,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); @@ -297,34 +325,26 @@ deregister_application (SpiBridge * app) dbus_connection_send (app->bus, message, NULL); if (message) dbus_message_unref (message); -} - -/*---------------------------------------------------------------------------*/ - -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; + if (app->app_bus_addr) + { + unlink (app->app_bus_addr); + g_free (app->app_bus_addr); + app->app_bus_addr = NULL; + } - /* Not currently creating an XDisplay */ -#if 0 - if (bridge_display) - XCloseDisplay (bridge_display); -#endif + if (app->app_tmp_dir) + { + rmdir (app->app_tmp_dir); + g_free (app->app_tmp_dir); + app->app_tmp_dir = NULL; + } } /*---------------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*/ + static AtkPlugClass *plug_class; static AtkSocketClass *socket_class; @@ -353,33 +373,33 @@ socket_ref_state_set (AtkObject *accessible) 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, SPI_DBUS_INTERFACE_ACCESSIBLE, "GetState"); + 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 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 @@ -421,7 +441,7 @@ 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); } @@ -445,8 +465,8 @@ install_plug_hooks () socket_class->embed = socket_embed_hook; } -static uint -get_ancestral_uid (uint pid) +static guint +get_ancestral_uid (guint pid) { FILE *fp; char buf [80]; @@ -478,7 +498,7 @@ get_ancestral_uid (uint pid) } static dbus_bool_t -user_check (DBusConnection *bus, unsigned long uid) +user_check (DBusConnection *bus, unsigned long uid, void *data) { if (uid == getuid () || uid == geteuid ()) return TRUE; @@ -490,45 +510,13 @@ user_check (DBusConnection *bus, unsigned long uid) 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); - new_list = g_list_append (spi_global_app_data->direct_connections, con); - if (new_list) - spi_global_app_data->direct_connections = new_list; -} - -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; + spi_global_app_data->direct_connections = g_list_append (spi_global_app_data->direct_connections, con); } @@ -571,7 +559,6 @@ handle_event_listener_registered (DBusConnection *bus, DBusMessage *message, static void remove_events (const char *bus_name, const char *event) { - event_data *evdata; gchar **remove_data; GList *list; @@ -588,11 +575,20 @@ remove_events (const char *bus_name, const char *event) 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); + if (list->prev) + { + GList *next = list->next; + list->prev = g_list_remove (list->prev, evdata); + list = next; + } + else + { + spi_global_app_data->events = g_list_remove (events, evdata); + list = spi_global_app_data->events; + } } else { @@ -607,7 +603,6 @@ static void handle_event_listener_deregistered (DBusConnection *bus, DBusMessage *message, void *user_data) { - const char *orig_name; gchar *name; char *sender; @@ -618,6 +613,25 @@ handle_event_listener_deregistered (DBusConnection *bus, DBusMessage *message, remove_events (sender, name); } +static void +handle_device_listener_registered (DBusConnection *bus, DBusMessage *message, + void *user_data) +{ + char *sender; + DBusMessageIter iter, iter_struct; + + if (strncmp (dbus_message_get_signature (message), "(s", 2) != 0) + { + g_warning ("atk-bridge: handle_device_listener_register: unknown signature"); + return; + } + + dbus_message_iter_init (message, &iter); + dbus_message_iter_recurse (&iter, &iter_struct); + dbus_message_iter_get_basic (&iter_struct, &sender); + spi_atk_add_client (sender); +} + static DBusHandlerResult signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) { @@ -628,7 +642,7 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - if (!strcmp (interface, SPI_DBUS_INTERFACE_REGISTRY)) + if (!strcmp (interface, ATSPI_DBUS_INTERFACE_REGISTRY)) { result = DBUS_HANDLER_RESULT_HANDLED; if (!strcmp (member, "EventListenerRegistered")) @@ -638,6 +652,16 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) else result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } + else if (!strcmp (interface, ATSPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER)) + { + result = DBUS_HANDLER_RESULT_HANDLED; + if (!strcmp (member, "KeystrokeListenerRegistered")) + handle_device_listener_registered (bus, message, user_data); + else if (!strcmp (member, "DeviceListenerRegistered")) + handle_device_listener_registered (bus, message, user_data); + else + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } if (!g_strcmp0(interface, DBUS_INTERFACE_DBUS) && !g_strcmp0(member, "NameOwnerChanged")) @@ -658,6 +682,76 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) return result; } +int +spi_atk_create_socket (SpiBridge *app) +{ +#ifndef DISABLE_P2P + DBusServer *server; + DBusError err; + + if (getuid () != 0) + { + app->app_tmp_dir = g_build_filename (g_get_user_runtime_dir (), + "at-spi2-XXXXXX", NULL); + if (!g_mkdtemp (app->app_tmp_dir)) + { + g_free (app->app_tmp_dir); + app->app_tmp_dir = NULL; + return FALSE; + } + } + + if (app->app_tmp_dir) + app->app_bus_addr = g_strdup_printf ("unix:path=%s/socket", app->app_tmp_dir); + else + app->app_bus_addr = g_strdup_printf ("unix:path=%s/at-spi2-socket-%d", + g_get_user_runtime_dir (), getpid ()); + + if (!spi_global_app_data->app_bus_addr) + return -1; + + 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; +} + +/* + * Checks the status of the environment variables + * + * At this moment it only checks NO_AT_BRIDGE + * + * Returns TRUE if there isn't anything on the environment preventing + * you to load the bridge, FALSE otherwise + */ +static gboolean +check_envvar (void) +{ + const gchar *envvar; + + envvar = g_getenv ("NO_AT_BRIDGE"); + + if (envvar && atoi (envvar) == 1) + return FALSE; + else + return TRUE; +} + /* * spi_app_init * @@ -669,23 +763,25 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) * - Application registration with the AT-SPI registry. * */ -static int -adaptor_init (gint * argc, gchar ** argv[]) +int +atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) { GOptionContext *opt; GError *err = NULL; DBusError error; AtkObject *root; - gchar *introspection_directory; - static gboolean inited = FALSE; + gboolean load_bridge; + DRoutePath *treepath, *accpath; - if (inited) + load_bridge = check_envvar (); + if (inited && !load_bridge) + g_warning ("ATK Bridge is disabled but a11y has already been enabled."); + + if (inited || !load_bridge) return 0; inited = TRUE; - DRoutePath *treepath, *accpath; - root = atk_get_root (); g_warn_if_fail (root); if (!root) @@ -792,10 +888,12 @@ adaptor_init (gint * argc, gchar ** argv[]) spi_global_app_data->bus); /* Register methods to send D-Bus signals on certain ATK events */ - spi_atk_register_event_listeners (); + if (clients) + 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_bus_add_match (spi_global_app_data->bus, "type='signal', interface='org.a11y.atspi.DeviceEventListener', sender='org.a11y.atspi.Registry'", NULL); dbus_connection_add_filter (spi_global_app_data->bus, signal_filter, NULL, NULL); @@ -805,56 +903,66 @@ adaptor_init (gint * argc, gchar ** argv[]) else get_registered_event_listeners (spi_global_app_data); - setup_bus(); - return 0; } -/*---------------------------------------------------------------------------*/ - -int -gtk_module_init (gint * argc, gchar ** argv[]) +void +atk_bridge_adaptor_cleanup (void) { - const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE"); + GList *l; + GSList *ls; - if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0) - { - return adaptor_init (argc, argv); - } - return 0; -} + g_return_if_fail (inited); -gchar* -g_module_check_init (GModule *module) -{ - g_module_make_resident (module); + if (!spi_global_app_data) + return; - return NULL; -} + spi_atk_tidy_windows (); + spi_atk_deregister_event_listeners (); -void -gnome_accessibility_module_init (void) -{ - const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE"); + deregister_application (spi_global_app_data); - if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0) + if (spi_global_app_data->bus) { - adaptor_init (NULL, NULL); + 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); + } - if (g_getenv ("AT_SPI_DEBUG")) - { - g_print ("Atk Accessibility bridge initialized\n"); - } + for (l = spi_global_app_data->direct_connections; l; l = l->next) + { + DBusConnection *connection; + + connection = l->data; + + droute_context_unregister (spi_global_app_data->droute, connection); + droute_unintercept_dbus (connection); + dbus_connection_unref (connection); } -} + g_list_free (spi_global_app_data->direct_connections); -void -gnome_accessibility_module_shutdown (void) -{ - spi_atk_deregister_event_listeners (); - exit_func (); + for (ls = clients; ls; ls = ls->next) + g_free (l->data); + g_slist_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; + + inited = FALSE; } +/*---------------------------------------------------------------------------*/ + static gchar *name_match_tmpl = "type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged', arg0='%s'"; @@ -869,7 +977,7 @@ spi_atk_add_client (const char *bus_name) if (!g_strcmp0 (l->data, bus_name)) return; } - if (!clients && spi_global_app_data->events_initialized) + if (!clients) spi_atk_register_event_listeners (); clients = g_slist_append (clients, g_strdup (bus_name)); match = g_strdup_printf (name_match_tmpl, bus_name); @@ -881,19 +989,25 @@ void spi_atk_remove_client (const char *bus_name) { GSList *l; + GSList *next_node; - for (l = clients; l; l = l->next) + l = clients; + while (l) { + next_node = 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); + clients = g_slist_delete_link (clients, l); if (!clients) spi_atk_deregister_event_listeners (); } + + l = next_node; } }