~desrt/libvalmynd/master

« back to all changes in this revision

Viewing changes to valmynd/flatten.vala

  • Committer: Ryan Lortie
  • Date: 2011-04-28 20:04:43 UTC
  • Revision ID: git-v1:afb50b527339349120f0a8f080ef0769b4411fbb
Remove virtual_ hackery

We no longer appear to be satisfying the strange combination of
circumstances required to trigger the bug, so stop working around it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
67
67
                        }
68
68
                }
69
69
 
70
 
                protected override Variant? virtual_get_item_attribute (int index, string name, VariantType? expected_type) {
 
70
                protected override Variant? get_item_attribute_value (int index, string name, VariantType? expected_type) {
71
71
                        return find_item (index).get_attribute_value (name, expected_type);
72
72
                }
73
73
 
194
194
                        return model.get_n_items () - del;
195
195
                }
196
196
 
197
 
                protected override Variant? virtual_get_item_attribute (int index, string name, VariantType? expected_type) {
198
 
                        return model.virtual_get_item_attribute (index + del, name, expected_type);
 
197
                protected override Variant? get_item_attribute_value (int index, string name, VariantType? expected_type) {
 
198
                        return model.get_item_attribute_value (index + del, name, expected_type);
199
199
                }
200
200
 
201
201
                protected override MenuModel? get_item_link (int index, string name) {
281
281
                        return n;
282
282
                }
283
283
 
284
 
                protected override Variant? virtual_get_item_attribute (int index, string name, VariantType? expected_type) {
 
284
                protected override Variant? get_item_attribute_value (int index, string name, VariantType? expected_type) {
285
285
                        if (index == 0) {
286
286
                                if (name == "type") {
287
287
                                        return new Variant.string ("separator");
290
290
                                return null;
291
291
                        }
292
292
 
293
 
                        return model.virtual_get_item_attribute (index - 1, name, expected_type);
 
293
                        return model.get_item_attribute_value (index - 1, name, expected_type);
294
294
                }
295
295
 
296
296
                protected override MenuModel? get_item_link (int index, string name) {