dbus_message_iter_next (&iter_struct);
dbus_message_iter_get_basic (&iter_struct, &obj_path);
+ g_free (app->desktop_name);
app->desktop_name = g_strdup (app_name);
+ g_free (app->desktop_path);
app->desktop_path = g_strdup (obj_path);
}
}
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;
+ app->desktop_name = g_strdup (ATSPI_DBUS_NAME_REGISTRY);
+ app->desktop_path = g_strdup (ATSPI_DBUS_PATH_ROOT);
message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
ATSPI_DBUS_PATH_ROOT,
if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1)
|| !pending)
{
+ dbus_message_unref (message);
return FALSE;
}
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;
}
dbus_connection_send (app->bus, message, NULL);
if (message)
dbus_message_unref (message);
+
+ if (app->app_bus_addr)
+ {
+ unlink (app->app_bus_addr);
+ g_free (app->app_bus_addr);
+ app->app_bus_addr = NULL;
+ }
+
+ if (app->app_tmp_dir)
+ {
+ rmdir (app->app_tmp_dir);
+ g_free (app->app_tmp_dir);
+ app->app_tmp_dir = NULL;
+ }
+
+ g_free (app->desktop_name);
+ app->desktop_name = NULL;
+ g_free (app->desktop_path);
+ app->desktop_path = NULL;
}
/*---------------------------------------------------------------------------*/
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];
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;
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
{
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
*
return TRUE;
}
+void
+spi_atk_activate ()
+{
+ DRoutePath *treepath;
+
+ spi_atk_register_event_listeners ();
+ if (!spi_global_cache)
+ {
+ spi_global_cache = g_object_new (SPI_CACHE_TYPE, NULL);
+ treepath = droute_add_one (spi_global_app_data->droute,
+ "/org/a11y/atspi/cache", spi_global_cache);
+
+ if (!treepath)
+ {
+ g_warning ("atk-bridge: Error in droute_add_one(). Already running?");
+ return;
+ }
+ spi_initialize_cache (treepath);
+ }
+}
+
/*
* spi_app_init
*
DBusError error;
AtkObject *root;
gboolean load_bridge;
+ DRoutePath *accpath;
load_bridge = check_envvar ();
if (inited && !load_bridge)
inited = TRUE;
- DRoutePath *treepath, *accpath;
-
root = atk_get_root ();
g_warn_if_fail (root);
if (!root)
g_option_context_add_main_entries (opt, atspi_option_entries, NULL);
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_warning ("AT-SPI Option parsing failed: %s\n", err->message);
+ g_error_free (err);
+ }
g_option_context_free (opt);
/* Allocate global data and do ATK initializations */
*/
spi_global_register = g_object_new (SPI_REGISTER_TYPE, NULL);
spi_global_leasing = g_object_new (SPI_LEASING_TYPE, NULL);
- spi_global_cache = g_object_new (SPI_CACHE_TYPE, NULL);
/* Register droute for routing AT-SPI messages */
spi_global_app_data->droute =
droute_new ();
- treepath = droute_add_one (spi_global_app_data->droute,
- "/org/a11y/atspi/cache", spi_global_cache);
-
- if (!treepath)
- {
- g_warning ("atk-bridge: Error in droute_add_one(). Already running?");
- return -1;
- }
-
accpath = droute_add_many (spi_global_app_data->droute,
"/org/a11y/atspi/accessible",
NULL,
/* Register all interfaces with droute and set up application accessible db */
- spi_initialize_cache (treepath);
spi_initialize_accessible (accpath);
spi_initialize_application (accpath);
spi_initialize_action (accpath);
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_activate ();
/* 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);
else
get_registered_event_listeners (spi_global_app_data);
- setup_bus();
-
return 0;
}
{
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_close (spi_global_app_data->bus);
dbus_connection_unref (spi_global_app_data->bus);
+ spi_global_app_data->bus = NULL;
}
for (l = spi_global_app_data->direct_connections; l; l = l->next)
dbus_connection_unref (connection);
}
g_list_free (spi_global_app_data->direct_connections);
+ spi_global_app_data->direct_connections = NULL;
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);
+ g_clear_object (&spi_global_cache);
+ g_clear_object (&spi_global_leasing);
+ g_clear_object (&spi_global_register);
if (spi_global_app_data->main_context)
g_main_context_unref (spi_global_app_data->main_context);
if (!g_strcmp0 (l->data, bus_name))
return;
}
- if (!clients && spi_global_app_data->events_initialized)
- spi_atk_register_event_listeners ();
+ if (!clients)
+ spi_atk_activate ();
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);
clients = g_slist_delete_link (clients, l);
if (!clients)
spi_atk_deregister_event_listeners ();
+ return;
}
l = next_node;
projects / platform / core / uifw / at-spi2-atk.git / blobdiff