Only initialize the cache when an AT is running

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

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index 08dfbd4..be1810c 100644 (file)
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -575,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
         {
@@ -743,6 +752,27 @@ check_envvar (void)
     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
  *
@@ -762,7 +792,7 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[])
   DBusError error;
   AtkObject *root;
   gboolean load_bridge;
-  DRoutePath *treepath, *accpath;
+  DRoutePath *accpath;
 
   load_bridge = check_envvar ();
   if (inited && !load_bridge)
@@ -786,7 +816,10 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[])
   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 */
@@ -833,21 +866,11 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[])
    */
   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,
@@ -858,7 +881,6 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[])
 
 
   /* 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);
@@ -880,7 +902,7 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[])
 
   /* Register methods to send D-Bus signals on certain ATK events */
   if (clients)
-    spi_atk_register_event_listeners ();
+    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);
@@ -969,7 +991,7 @@ spi_atk_add_client (const char *bus_name)
       return;
   }
   if (!clients)
-    spi_atk_register_event_listeners ();
+    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);
@@ -996,6 +1018,7 @@ spi_atk_remove_client (const char *bus_name)
       clients = g_slist_delete_link (clients, l);
       if (!clients)
         spi_atk_deregister_event_listeners ();
+      return;
     }
 
     l = next_node;