diff options
| author | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-10-22 12:43:15 +0100 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-10-22 23:16:16 -0400 |
| commit | e71f8ff46b39d32cd68464265bd8990dc1230f43 (patch) | |
| tree | b50dcadb1124d46a205064e662ae1846c1d69ac3 | |
| parent | 0d9cfb004d528fd0a7a0b05943db3b2097d8a085 (diff) | |
| download | gobject-introspection-e71f8ff46b39d32cd68464265bd8990dc1230f43.tar.gz | |
Fix make check after 0d9cfb004d528
https://bugzilla.gnome.org/show_bug.cgi?id=599327
| -rw-r--r-- | giscanner/glibtransformer.py | 4 | ||||
| -rw-r--r-- | tests/scanner/foo-1.0-expected.gir | 2 | ||||
| -rw-r--r-- | tests/scanner/foo-1.0-expected.tgir | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/giscanner/glibtransformer.py b/giscanner/glibtransformer.py index 76085c1a..c58644b0 100644 --- a/giscanner/glibtransformer.py +++ b/giscanner/glibtransformer.py @@ -255,7 +255,7 @@ class GLibTransformer(object): self._names) except KeyError, e: return Unresolved(gtype_name) - + def _resolve_gtypename_chain(self, gtype_names): """Like _resolve_gtypename, but grab the first one that resolves. If none of them do, return an Unresolved for the first.""" @@ -700,7 +700,7 @@ class GLibTransformer(object): return # Get a list of parents here; some of them may be hidden, and what # we really want to do is use the most-derived one that we know of. - # + # parent_type_names = xmlnode.attrib['parents'].split(',') parent_gitype = self._resolve_gtypename_chain(parent_type_names) is_abstract = not not xmlnode.attrib.get('abstract', False) diff --git a/tests/scanner/foo-1.0-expected.gir b/tests/scanner/foo-1.0-expected.gir index 85e2ace0..5eae4cde 100644 --- a/tests/scanner/foo-1.0-expected.gir +++ b/tests/scanner/foo-1.0-expected.gir @@ -99,7 +99,7 @@ and/or use gtk-doc annotations. --> </record> <class name="Buffer" c:type="FooBuffer" - parent="GObject.Object" + parent="Object" glib:type-name="FooBuffer" glib:get-type="foo_buffer_get_type" glib:type-struct="BufferClass"> diff --git a/tests/scanner/foo-1.0-expected.tgir b/tests/scanner/foo-1.0-expected.tgir index fe09907c..81ebd02c 100644 --- a/tests/scanner/foo-1.0-expected.tgir +++ b/tests/scanner/foo-1.0-expected.tgir @@ -74,7 +74,7 @@ </return-value> </method> </record> - <class name="Buffer" parent="GObject.Object" glib:type-struct="BufferClass" glib:type-name="FooBuffer" glib:get-type="foo_buffer_get_type"> + <class name="Buffer" parent="Object" glib:type-struct="BufferClass" glib:type-name="FooBuffer" glib:get-type="foo_buffer_get_type"> <implements name="Interface"/> <method name="some_method" c:identifier="foo_buffer_some_method"> <return-value transfer-ownership="none"> |