From 802134093318c29e746c429356913638b84f9a20 Mon Sep 17 00:00:00 2001
From: Mike Gorse <mgorse@novell.com>
Date: Sat, 9 Jul 2011 15:47:59 -0500
Subject: [PATCH] Fix for BGO#654314: Make role names consistent with atk

Role names sometimes differed slightly between ATK and AT-SPI (in
general,
AT-SPI would often include a hyphen where ATK included a space or simply
compounded the words).  This caused changes in behavior when AT-SPI
began to use its stored values for role names, since they were now
different from those provided by ATK.
---
 atspi/atspi-accessible.c | 88 ++++++++++++++++++++++++------------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/atspi/atspi-accessible.c b/atspi/atspi-accessible.c
index 7606244..49f5308 100644
--- a/atspi/atspi-accessible.c
+++ b/atspi/atspi-accessible.c
@@ -182,72 +182,72 @@ atspi_accessible_class_init (AtspiAccessibleClass *klass)
 static const char *role_names [] =
 {
   "invalid",
-  "accel-label",
+  "accelerator label",
   "alert",
   "animation",
   "arrow",
   "calendar",
   "canvas",
   "check-box",
-  "check-menu-item",
-  "color-chooser",
-  "column-header",
-  "combo-box",
-  "date-editor",
-  "desktop-icon",
-  "desktop-frame",
+  "check menu item",
+  "color chooser",
+  "column header",
+  "combo box",
+  "dateeditor",
+  "desktop icon",
+  "desktop frame",
   "dial",
   "dialog",
-  "directory-pane",
-  "drawing-area",
-  "file-chooser",
+  "directory pane",
+  "drawing area",
+  "file chooser",
   "filler",
   "focus traversable",
-  "font-chooser",
+  "fontchooser",
   "frame",
-  "glass-pane",
-  "html-container",
+  "glass pane",
+  "html container",
   "icon",
   "image",
-  "internalframe",
+  "internal frame",
   "label",
-  "layered-pane",
+  "layered pane",
   "list",
-  "list-item",
+  "list item",
   "menu",
-  "menu-bar",
-  "menu-item",
-  "option-pane",
-  "page-tab",
-  "page-tab-list",
+  "menu bar",
+  "menu item",
+  "option pane",
+  "page tab",
+  "page tab list",
   "panel",
-  "password-text",
-  "popup-menu",
-  "progress-bar",
-  "push-button",
-  "radio-button",
-  "radio-menu-item",
-  "root-pane",
-  "row-header",
-  "scroll-bar",
-  "scroll-pane",
+  "password text",
+  "popup menu",
+  "progress bar",
+  "push button",
+  "radio button",
+  "radio menu item",
+  "root pane",
+  "row header",
+  "scroll bar",
+  "scroll pane",
   "separator",
   "slider",
-  "spin-button",
-  "split-pane",
+  "spin button",
+  "split pane",
   "statusbar",
   "table",
-  "table-cell",
-  "table-column-header",
-  "table-row-header",
-  "tear-off-menu-item",
+  "table cell",
+  "table column header",
+  "table row header",
+  "tear off menu item",
   "terminal",
   "text",
-  "toggle-button",
-  "tool-bar",
-  "tool-tip",
+  "toggle button",
+  "tool bar",
+  "tool tip",
   "tree",
-  "tree-table",
+  "tree table",
   "unknown",
   "viewport",
   "window",
@@ -259,11 +259,11 @@ static const char *role_names [] =
   "application",
   "autocomplete",
   "editbar",
-  "embedded",
+  "embedded component",
   "entry",
   "chart",
   "caption",
-  "document_frame",
+  "document frame",
   "heading",
   "page",
   "section",
-- 
2.7.4