Use the event name when sending screen reader events over dbus

For screen reader events, look at the name of the signal and convert it,
rather than hard-coding "RegionChanged." This is necessary to allow
screen_reader_signal_watcher to process signals that will be added in the
future.

https://gitlab.gnome.org/GNOME/orca/issues/36

1 files changed, 1 insertions, 31 deletions

diff --git a/atspi/atspi-event-listener.c b/atspi/atspi-event-listener.c
index 249890b6..03e930ae 100644
--- a/atspi/atspi-event-listener.c
+++ b/atspi/atspi-event-listener.c
@@ -332,40 +332,10 @@ demarshal_rect (DBusMessageIter *iter, AtspiRect *rect)
   return TRUE;
 }
 
-static gchar *
-strdup_and_adjust_for_dbus (const char *s)
-{
-  gchar *d = g_strdup (s);
-  gchar *p;
-  int parts = 0;
-
-  if (!d)
-    return NULL;
-
-  for (p = d; *p; p++)
-  {
-    if (*p == '-')
-    {
-      memmove (p, p + 1, g_utf8_strlen (p, -1));
-      *p = toupper (*p);
-    }
-    else if (*p == ':')
-    {
-      parts++;
-      if (parts == 2)
-        break;
-      p [1] = toupper (p [1]);
-    }
-  }
-
-  d [0] = toupper (d [0]);
-  return d;
-}
-
 static gboolean
 convert_event_type_to_dbus (const char *eventType, char **categoryp, char **namep, char **detailp, GPtrArray **matchrule_array)
 {
-  gchar *tmp = strdup_and_adjust_for_dbus (eventType);
+  gchar *tmp = _atspi_strdup_and_adjust_for_dbus (eventType);
   char *category = NULL, *name = NULL, *detail = NULL;
   char *saveptr = NULL;