← Back to branch summary

~ubuntu-branches/ubuntu/lucid/at-spi/lucid-proposed

« back to all changes in this revision

Viewing changes to libspi/collection.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2010-07-02 15:50:32 UTC
  • mfrom: (1.2.1 upstream) (0.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20100702155032-mw7vioq2owm3a809
Tags: 1.30.1-0ubuntu1
https://launchpad.net/bugs/600906
* New upstream release (LP: #600906)
  -  Fixes GNOME bugzilla #538680, collection.getMatchesTo() seems to ignore
     the count.
  - Updated translations:

Show diffs side-by-side

added added

removed removed

Lines of Context:
libspi/collection.c
610
610
    if (flag && match_interfaces_lookup (obj, mrp, ev) 
611
611
               && match_states_lookup (obj, mrp, ev)     
612
612
               && match_roles_lookup (obj, mrp, ev)  
613
 
               && match_attributes_lookup (obj, mrp, ev))
 
613
               && match_attributes_lookup (obj, mrp, ev)
 
614
               && (max == 0 || kount < max))
614
615
    {
615
616
         ls = g_list_append (ls, obj);
616
617
         kount++;
622
623
    indexinparent = Accessibility_Accessible_getIndexInParent (obj, ev);
623
624
    parent = Accessibility_Accessible__get_parent (obj, ev);
624
625
 
625
 
    if(indexinparent > 0)
 
626
    if(indexinparent > 0 && (max == 0 || kount < max))
626
627
    {
627
628
         /* there are still some siblings to visit so get the previous sibling
628
629
            and get it's last descendant.
642
643
         kount = sort_order_rev_canonical (mrp, ls,  kount, max, 
643
644
                                       nextobj, TRUE, pobj, ev);
644
645
    } 
645
 
    else
 
646
    else if (max == 0 || kount < max)
646
647
    {
647
648
         /* no more siblings so next node must be the parent */
648
649
         kount = sort_order_rev_canonical (mrp, ls,  kount, max,