Don't iterate over the list twice when removing events

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / bridge.c

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index d776a4b..96fdbf9 100644 (file)
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -56,6 +56,8 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data);
 
 SpiBridge *spi_global_app_data = NULL;
 
+static gboolean inited = FALSE;
+
 /*---------------------------------------------------------------------------*/
 
 static void
@@ -268,7 +270,6 @@ register_application (SpiBridge * app)
   DBusMessageIter iter;
   DBusError error;
   DBusPendingCall *pending;
-  const int max_addr_length = 128; /* should be long enough */
 
   dbus_error_init (&error);
 
@@ -296,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;
 }
 
@@ -336,6 +325,20 @@ deregister_application (SpiBridge * app)
   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;
+  }
 }
 
 /*---------------------------------------------------------------------------*/
@@ -462,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];
@@ -516,34 +519,6 @@ new_connection_cb (DBusServer *server, DBusConnection *con, void *data)
   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;
@@ -600,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
         {
@@ -698,6 +682,55 @@ 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
  *
@@ -737,8 +770,8 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[])
   GError *err = NULL;
   DBusError error;
   AtkObject *root;
-  static gboolean inited = FALSE;
   gboolean load_bridge;
+  DRoutePath *treepath, *accpath;
 
   load_bridge = check_envvar ();
   if (inited && !load_bridge)
@@ -749,8 +782,6 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[])
 
   inited = TRUE;
 
-  DRoutePath *treepath, *accpath;
-
   root = atk_get_root ();
   g_warn_if_fail (root);
   if (!root)
@@ -857,7 +888,8 @@ atk_bridge_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);
@@ -871,8 +903,6 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[])
   else
     get_registered_event_listeners (spi_global_app_data);
 
-  setup_bus();
-
   return 0;
 }
 
@@ -882,6 +912,8 @@ atk_bridge_adaptor_cleanup (void)
   GList *l;
   GSList *ls;
 
+  g_return_if_fail (inited);
+
   if (!spi_global_app_data)
       return;
 
@@ -925,6 +957,8 @@ atk_bridge_adaptor_cleanup (void)
 
   g_free (spi_global_app_data);
   spi_global_app_data = NULL;
+
+  inited = FALSE;
 }
 
 /*---------------------------------------------------------------------------*/
@@ -943,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);