Only send property-change signals relevant for caching, absent listeners

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

diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c
index 2875ffd..efd9c20 100644 (file)
--- a/atk-adaptor/event.c
+++ b/atk-adaptor/event.c
@@ -64,9 +64,8 @@ switch_main_context (GMainContext *cnx)
 {
   GList *list;
 
-#ifndef DISABLE_P2P
-  atspi_dbus_server_setup_with_g_main (spi_global_app_data->server, cnx);
-#endif
+  if (spi_global_app_data->server)
+    atspi_dbus_server_setup_with_g_main (spi_global_app_data->server, cnx);
   atspi_dbus_connection_setup_with_g_main (spi_global_app_data->bus, cnx);
   for (list = spi_global_app_data->direct_connections; list; list = list->next)
     atspi_dbus_connection_setup_with_g_main (list->data, cnx);
@@ -372,7 +371,11 @@ signal_is_needed (const gchar *klass, const gchar *major, const gchar *minor)
    * TODO: FOr 2.2, have at-spi2-core define a special "cache listener" for
    * this instead, so that we don't send these if no one is listening */
   if (!g_strcmp0 (data [1], "ChildrenChanged") ||
-      !g_strcmp0 (data [1], "PropertyChange") ||
+      ((!g_strcmp0 (data [1], "PropertyChange")) &&
+       (!g_strcmp0 (data [2], "accessible-name") ||
+        !g_strcmp0 (data [2], "accessible-description") ||
+        !g_strcmp0 (data [2], "accessible-parent") ||
+        !g_strcmp0 (data [2], "accessible-role"))) ||
       !g_strcmp0 (data [1], "StateChanged"))
   {
     g_free (data [2]);
@@ -437,7 +440,7 @@ emit_event (AtkObject  *obj,
             void (*append_variant) (DBusMessageIter *, const char *, const void *))
 {
   DBusConnection *bus = spi_global_app_data->bus;
-  const char *path;
+  char *path;
   char *minor_dbus;
 
   gchar *cname;
@@ -623,7 +626,7 @@ state_event_listener (GSignalInvocationHint * signal_hint,
                       const GValue * param_values, gpointer data)
 {
   AtkObject *accessible;
-  gchar *pname;
+  const gchar *pname;
   guint detail1;
 
   accessible = ATK_OBJECT (g_value_get_object (&param_values[0]));
@@ -852,7 +855,8 @@ text_insert_event_listener (GSignalInvocationHint * signal_hint,
   guint text_changed_signal_id;
   GSignalQuery signal_query;
   const gchar *name;
-  gchar *minor, *text;
+  const gchar *minor_raw, *text;
+  gchar *minor;
   gint detail1 = 0, detail2 = 0;
 
   accessible = ATK_OBJECT (g_value_get_object (&param_values[0]));
@@ -865,9 +869,9 @@ text_insert_event_listener (GSignalInvocationHint * signal_hint,
 
 
   /* Add the insert and keep any detail coming from atk */
-  minor = g_quark_to_string (signal_hint->detail);
-  if (minor)
-    minor = g_strconcat ("insert:", minor, NULL);
+  minor_raw = g_quark_to_string (signal_hint->detail);
+  if (minor_raw)
+    minor = g_strconcat ("insert:", minor_raw, NULL);
   else
     minor = g_strdup ("insert");
 
@@ -900,7 +904,8 @@ text_remove_event_listener (GSignalInvocationHint * signal_hint,
   guint text_changed_signal_id;
   GSignalQuery signal_query;
   const gchar *name;
-  gchar *minor, *text;
+  const gchar *minor_raw, *text;
+  gchar *minor;
   gint detail1 = 0, detail2 = 0;
 
   accessible = ATK_OBJECT (g_value_get_object (&param_values[0]));
@@ -911,12 +916,11 @@ text_remove_event_listener (GSignalInvocationHint * signal_hint,
   g_signal_query (text_changed_signal_id, &signal_query);
   name = signal_query.signal_name;
 
-  minor = g_quark_to_string (signal_hint->detail);
+  minor_raw = g_quark_to_string (signal_hint->detail);
 
   /* Add the delete and keep any detail coming from atk */
-  minor = g_quark_to_string (signal_hint->detail);
-  if (minor)
-    minor = g_strconcat ("delete:", minor, NULL);
+  if (minor_raw)
+    minor = g_strconcat ("delete:", minor_raw, NULL);
   else
     minor = g_strdup ("delete");
 
@@ -1016,6 +1020,7 @@ children_changed_event_listener (GSignalInvocationHint * signal_hint,
                                             detail1);
       emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
                   "(so)", ao, append_object);
+      g_object_unref (ao);
     }
   else
     {