[prevent] CID479283 - navigator.c:generate_trait

Change-Id: Ic6251d990cfda6e7cf893dd07059c8b931f9bee8

diff --git a/src/navigator.c b/src/navigator.c
index 5a6cc10..fcf5336 100644 (file)
--- a/src/navigator.c
+++ b/src/navigator.c
@@ -486,6 +486,22 @@ char *generate_trait(AtspiAccessible * obj)
                } else {
                        strncat(ret, _("IDS_TRAIT_CHECK_BOX_NOT_SELECTED"), sizeof(ret) - strlen(ret) - 1);
                }
+
+               if (role == ATSPI_ROLE_RADIO_BUTTON) {
+                       /* Don't say role name if it's a color chooser radio button */
+                       AtspiAccessible *parent;
+                       AtspiRole parent_role;
+                       parent = atspi_accessible_get_parent(obj, NULL);
+                       parent_role = atspi_accessible_get_role(parent, NULL);
+                       if (parent_role != ATSPI_ROLE_COLOR_CHOOSER) {
+                               char *role_name;
+                               role_name = atspi_accessible_get_localized_role_name(obj, NULL);
+                               strncat(ret, ", ", sizeof(ret) - strlen(ret) - 1);
+                               strncat(ret, role_name, sizeof(ret) - strlen(ret) - 1);
+                               free(role_name);
+                       }
+                       g_object_unref(parent);
+               }
        } else if (role == ATSPI_ROLE_PUSH_BUTTON) {
                strncat(ret, _("IDS_TRAIT_PUSH_BUTTON"), sizeof(ret) - strlen(ret) - 1);
        } else if (role == ATSPI_ROLE_PROGRESS_BAR) {
@@ -506,19 +522,6 @@ char *generate_trait(AtspiAccessible * obj)
                } else {
                        strncat(ret, _("IDS_TRAIT_TOGGLE_BUTTON_OFF"), sizeof(ret) - strlen(ret) - 1);
                }
-       } else if (role == ATSPI_ROLE_RADIO_BUTTON) {
-               /* Don't say role name if it's a color chooser radio button */
-               AtspiAccessible *parent;
-               AtspiRole parent_role;
-               parent = atspi_accessible_get_parent(obj, NULL);
-               parent_role = atspi_accessible_get_role(parent, NULL);
-               if (parent_role != ATSPI_ROLE_COLOR_CHOOSER) {
-                       char *role_name;
-                       role_name = atspi_accessible_get_localized_role_name(obj, NULL);
-                       strncat(ret, role_name, sizeof(ret) - strlen(ret) - 1);
-                       free(role_name);
-               }
-               g_object_unref(parent);
        } else if (role == ATSPI_ROLE_HEADING) {
                return strdup("");
        } else {