removed switch cases ATSPI_ROLE_POPUP_MENU & ATSPI_ROLE_DIALOG from generate_role_trait 72/105772/1
authorRadoslaw Cybulski <r.cybulski@partner.samsung.com>
Mon, 19 Dec 2016 11:27:41 +0000 (12:27 +0100)
committerRadoslaw Cybulski <r.cybulski@partner.samsung.com>
Mon, 19 Dec 2016 11:27:41 +0000 (12:27 +0100)
Change-Id: I36020a288c51ce00ea11ab51c8ed8d788cc69afb

src/navigator.c

index 4a821c152f018b21b98782e169ab76749ecf35fa..0564447f77cf041e61434c2ad9323fe56020144c 100644 (file)
@@ -306,23 +306,6 @@ char *generate_role_trait(AtspiAccessible * obj)
                }
                break;
        }
-       case ATSPI_ROLE_POPUP_MENU: {
-               AtspiAccessible *parent = atspi_accessible_get_parent(obj, NULL);
-               AtspiRole parent_role = atspi_accessible_get_role(parent, NULL);
-               if (parent_role == ATSPI_ROLE_COMBO_BOX) break;
-               int children_count;
-               children_count = atspi_accessible_get_child_count(obj, NULL);
-               snprintf(ret, sizeof(ret), "%s, %s %d %s", _("IDS_TRAIT_CTX_POPUP"),
-                       _("IDS_TRAIT_SHOWING"), children_count, _("IDS_TRAIT_ITEMS"));
-               break;
-       }
-       case ATSPI_ROLE_DIALOG: {
-               int children_count = _find_popup_list_children_count(obj);
-               if (children_count > 0)
-                       snprintf(ret, sizeof(ret), "%s %d %s",
-                               _("IDS_TRAIT_SHOWING"), children_count, _("IDS_TRAIT_ITEMS"));
-               break;
-       }
        case ATSPI_ROLE_COMBO_BOX: {
                int children_count = atspi_accessible_get_child_count(obj, NULL);
                snprintf(ret, sizeof(ret), _("IDS_TRAIT_PD_HOVERSEL"), children_count);
@@ -375,6 +358,8 @@ char *generate_role_trait(AtspiAccessible * obj)
        case ATSPI_ROLE_MENU_ITEM:
        case ATSPI_ROLE_RADIO_MENU_ITEM:
        case ATSPI_ROLE_RADIO_BUTTON:
+       case ATSPI_ROLE_POPUP_MENU:
+       case ATSPI_ROLE_DIALOG:
        case ATSPI_ROLE_GROUPING: {
                break;
        }