projects
/
platform
/
core
/
uifw
/
at-spi2-atk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ref an object while adding it to the cache
[platform/core/uifw/at-spi2-atk.git]
/
atk-adaptor
/
adaptors
/
collection-adaptor.c
diff --git
a/atk-adaptor/adaptors/collection-adaptor.c
b/atk-adaptor/adaptors/collection-adaptor.c
index
30373fd
..
3bf76a3
100644
(file)
--- a/
atk-adaptor/adaptors/collection-adaptor.c
+++ b/
atk-adaptor/adaptors/collection-adaptor.c
@@
-86,7
+86,7
@@
match_states_all_p (AtkObject * child, gint * set)
gint i;
gboolean ret = TRUE;
gint i;
gboolean ret = TRUE;
- if (set == NULL)
+ if (set == NULL
|| set[0] == BITARRAY_SEQ_TERM
)
return TRUE;
chs = atk_object_ref_state_set (child);
return TRUE;
chs = atk_object_ref_state_set (child);
@@
-112,7
+112,7
@@
match_states_any_p (AtkObject * child, gint * set)
gint i;
gboolean ret = FALSE;
gint i;
gboolean ret = FALSE;
- if (set == NULL)
+ if (set == NULL
|| set[0] == BITARRAY_SEQ_TERM
)
return TRUE;
chs = atk_object_ref_state_set (child);
return TRUE;
chs = atk_object_ref_state_set (child);
@@
-137,7
+137,7
@@
match_states_none_p (AtkObject * child, gint * set)
gint i;
gboolean ret = TRUE;
gint i;
gboolean ret = TRUE;
- if (set == NULL)
+ if (set == NULL
|| set[0] == BITARRAY_SEQ_TERM
)
return TRUE;
chs = atk_object_ref_state_set (child);
return TRUE;
chs = atk_object_ref_state_set (child);
@@
-538,7
+538,8
@@
sort_order_rev_canonical (MatchRulePrivate * mrp, GList * ls,
/* Add to the list if it matches */
if (flag && match_interfaces_lookup (obj, mrp)
&& match_states_lookup (obj, mrp)
/* Add to the list if it matches */
if (flag && match_interfaces_lookup (obj, mrp)
&& match_states_lookup (obj, mrp)
- && match_roles_lookup (obj, mrp) && match_attributes_lookup (obj, mrp))
+ && match_roles_lookup (obj, mrp) && match_attributes_lookup (obj, mrp)
+ && (max == 0 || kount < max))
{
ls = g_list_append (ls, obj);
kount++;
{
ls = g_list_append (ls, obj);
kount++;
@@
-551,7
+552,7
@@
sort_order_rev_canonical (MatchRulePrivate * mrp, GList * ls,
indexinparent = atk_object_get_index_in_parent (obj);
parent = atk_object_get_parent (obj);
indexinparent = atk_object_get_index_in_parent (obj);
parent = atk_object_get_parent (obj);
- if (indexinparent > 0)
+ if (indexinparent > 0
&& (max == 0 || kount < max)
)
{
/* there are still some siblings to visit so get the previous sibling
and get it's last descendant.
{
/* there are still some siblings to visit so get the previous sibling
and get it's last descendant.
@@
-571,7
+572,7
@@
sort_order_rev_canonical (MatchRulePrivate * mrp, GList * ls,
kount = sort_order_rev_canonical (mrp, ls, kount, max,
nextobj, TRUE, pobj);
}
kount = sort_order_rev_canonical (mrp, ls, kount, max,
nextobj, TRUE, pobj);
}
- else
+ else
if (max == 0 || kount < max)
{
/* no more siblings so next node must be the parent */
kount = sort_order_rev_canonical (mrp, ls, kount, max,
{
/* no more siblings so next node must be the parent */
kount = sort_order_rev_canonical (mrp, ls, kount, max,
@@
-844,7
+845,7
@@
inorder (AtkObject * collection, MatchRulePrivate * mrp,
obj = parent;
}
obj = parent;
}
- if (kount < max)
+ if (
max == 0 ||
kount < max)
{
kount = sort_order_canonical (mrp, ls, kount, max,
obj, i + 1, TRUE, FALSE, TRUE, TRUE);
{
kount = sort_order_canonical (mrp, ls, kount, max,
obj, i + 1, TRUE, FALSE, TRUE, TRUE);
@@
-1135,5
+1136,5
@@
void
spi_initialize_collection (DRoutePath * path)
{
droute_path_add_interface (path,
spi_initialize_collection (DRoutePath * path)
{
droute_path_add_interface (path,
- SPI_DBUS_INTERFACE_COLLECTION, spi_org_
freedesktop
_atspi_Collection, methods, NULL);
+ SPI_DBUS_INTERFACE_COLLECTION, spi_org_
a11y
_atspi_Collection, methods, NULL);
};
};