diff options
author | Lionel Landwerlin <llandwerlin@gmail.com> | 2015-05-03 11:37:48 +0100 |
---|---|---|
committer | Lionel Landwerlin <lionel.g.landwerlin@intel.com> | 2015-05-11 16:05:02 +0100 |
commit | 8ed72fd2641f1fdf21eefb7f8e7b36e58f03268b (patch) | |
tree | 9637e9b05baf65761b1ac97644bab401a3c8c90e | |
parent | 3661f9336f9a7ad67a26c2d4bcd37deac5c711ce (diff) | |
download | gobject-introspection-8ed72fd2641f1fdf21eefb7f8e7b36e58f03268b.tar.gz |
scanner/girepository: remove GdkRectangle->CairoRectangleInt automatic conversion
https://bugzilla.gnome.org/show_bug.cgi?id=748832
-rw-r--r-- | girepository/girepository.c | 12 | ||||
-rw-r--r-- | giscanner/ast.py | 6 |
2 files changed, 0 insertions, 18 deletions
diff --git a/girepository/girepository.c b/girepository/girepository.c index 93382fd8..4291b7e3 100644 --- a/girepository/girepository.c +++ b/girepository/girepository.c @@ -807,18 +807,6 @@ g_irepository_find_by_gtype (GIRepository *repository, data.result_typelib = NULL; data.found_prefix = FALSE; - /* There is a corner case regarding GdkRectangle. GdkRectangle is a - * boxed type, but it is just an alias to boxed struct - * CairoRectangleInt. Scanner automatically converts all references - * to GdkRectangle to CairoRectangleInt, so GdkRectangle does not - * appear in the typelibs at all, although user code might query it. - * So if we get such query, we also change it to lookup of - * CairoRectangleInt. - * https://bugzilla.gnome.org/show_bug.cgi?id=655423 - */ - if (G_UNLIKELY (!strcmp (data.gtype_name, "GdkRectangle"))) - data.gtype_name = "CairoRectangleInt"; - /* Inside each typelib, we include the "C prefix" which acts as * a namespace mechanism. For GtkTreeView, the C prefix is Gtk. * Given the assumption that GTypes for a library also use the diff --git a/giscanner/ast.py b/giscanner/ast.py index 12f273e7..fe3c5672 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -112,12 +112,6 @@ in contrast to the other create_type() functions.""" return Array(None, bare_utf8, ctype=None, gtype_name=gtype_name, is_const=False) - # Workaround for Gdk.Rectangle being boxed alias for - # cairo.RectangleInt. G-I does not support boxing of aliases. - # See https://bugzilla.gnome.org/show_bug.cgi?id=655423 - if gtype_name == 'GdkRectangle': - gtype_name = 'CairoRectangleInt' - return cls(gtype_name=gtype_name) def get_giname(self): |