summaryrefslogtreecommitdiff
path: root/gir
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2010-07-07 14:07:17 -0400
committerColin Walters <walters@verbum.org>2010-07-09 14:15:52 -0400
commit5cb925b20739c04e18e94a03a3e4e68041894b03 (patch)
tree246f895c0a92ab1afd341170e45908104964ece3 /gir
parent07a36b499a7db6c65132511dc43f6acd281100ec (diff)
downloadgobject-introspection-5cb925b20739c04e18e94a03a3e4e68041894b03.tar.gz
Don't include machine-dependent integral types in the typelib
Previously we had both e.g. GI_TYPE_TAG_LONG and GI_TYPE_TAG_INT64, but in fact the typelib is already machine-specific, so it makes sense to just encode this as a fixed type. The .gir remains abstract. We also remove size_t from the typelib; one would never want to treat it differently than an integer. time_t is removed as well; while bindings like gjs had special handling to turn it into e.g. a JS Date object, I don't think we should encourage people to use these POSIX types in their API. Use GTimeVal or the like instead. Because the typelib is now really machine-specific, we need to remove the -expected.tgirs from git. (We could potentially add a check which wasn't just a literal diff later) https://bugzilla.gnome.org/show_bug.cgi?id=623774
Diffstat (limited to 'gir')
-rw-r--r--gir/Everything-1.0-expected.gir27
-rw-r--r--gir/GIMarshallingTests-1.0-expected.gir32
2 files changed, 37 insertions, 22 deletions
diff --git a/gir/Everything-1.0-expected.gir b/gir/Everything-1.0-expected.gir
index 023f0bbd..aa7de3b4 100644
--- a/gir/Everything-1.0-expected.gir
+++ b/gir/Everything-1.0-expected.gir
@@ -1888,21 +1888,21 @@ call and can be released on return.</doc>
</function>
<function name="test_size" c:identifier="test_size">
<return-value transfer-ownership="none">
- <type name="size_t" c:type="gsize"/>
+ <type name="gsize" c:type="gsize"/>
</return-value>
<parameters>
<parameter name="in" transfer-ownership="none">
- <type name="size_t" c:type="gsize"/>
+ <type name="gsize" c:type="gsize"/>
</parameter>
</parameters>
</function>
<function name="test_ssize" c:identifier="test_ssize">
<return-value transfer-ownership="none">
- <type name="ssize_t" c:type="gssize"/>
+ <type name="gssize" c:type="gssize"/>
</return-value>
<parameters>
<parameter name="in" transfer-ownership="none">
- <type name="ssize_t" c:type="gssize"/>
+ <type name="gssize" c:type="gssize"/>
</parameter>
</parameters>
</function>
@@ -1977,11 +1977,11 @@ call and can be released on return.</doc>
</function>
<function name="test_timet" c:identifier="test_timet">
<return-value transfer-ownership="none">
- <type name="time_t" c:type="time_t"/>
+ <type name="long" c:type="time_t"/>
</return-value>
<parameters>
<parameter name="in" transfer-ownership="none">
- <type name="time_t" c:type="time_t"/>
+ <type name="long" c:type="time_t"/>
</parameter>
</parameters>
</function>
@@ -2321,5 +2321,20 @@ call and can be released on return.</doc>
</parameter>
</parameters>
</function>
+ <function name="test_value_set_fundamental_object"
+ c:identifier="test_value_set_fundamental_object"
+ introspectable="0">
+ <return-value transfer-ownership="none">
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ <parameter name="value" transfer-ownership="none">
+ <type name="GObject.Value" c:type="GValue*"/>
+ </parameter>
+ <parameter name="fundamental_object" transfer-ownership="none">
+ <type name="TestFundamentalObject" c:type="TestFundamentalObject*"/>
+ </parameter>
+ </parameters>
+ </function>
</namespace>
</repository>
diff --git a/gir/GIMarshallingTests-1.0-expected.gir b/gir/GIMarshallingTests-1.0-expected.gir
index 798ecc75..164f7f14 100644
--- a/gir/GIMarshallingTests-1.0-expected.gir
+++ b/gir/GIMarshallingTests-1.0-expected.gir
@@ -2940,7 +2940,7 @@ and/or use gtk-doc annotations. -->
</return-value>
<parameters>
<parameter name="size" transfer-ownership="none">
- <type name="size_t" c:type="gsize"/>
+ <type name="gsize" c:type="gsize"/>
</parameter>
</parameters>
</function>
@@ -2954,7 +2954,7 @@ and/or use gtk-doc annotations. -->
direction="inout"
caller-allocates="0"
transfer-ownership="full">
- <type name="size_t" c:type="gsize*"/>
+ <type name="gsize" c:type="gsize*"/>
</parameter>
</parameters>
</function>
@@ -2967,14 +2967,14 @@ and/or use gtk-doc annotations. -->
direction="out"
caller-allocates="0"
transfer-ownership="full">
- <type name="size_t" c:type="gsize*"/>
+ <type name="gsize" c:type="gsize*"/>
</parameter>
</parameters>
</function>
<function name="size_return"
c:identifier="g_i_marshalling_tests_size_return">
<return-value transfer-ownership="none">
- <type name="size_t" c:type="gsize"/>
+ <type name="gsize" c:type="gsize"/>
</return-value>
</function>
<function name="ssize_in_max"
@@ -2984,7 +2984,7 @@ and/or use gtk-doc annotations. -->
</return-value>
<parameters>
<parameter name="ssize" transfer-ownership="none">
- <type name="ssize_t" c:type="gssize"/>
+ <type name="gssize" c:type="gssize"/>
</parameter>
</parameters>
</function>
@@ -2995,7 +2995,7 @@ and/or use gtk-doc annotations. -->
</return-value>
<parameters>
<parameter name="ssize" transfer-ownership="none">
- <type name="ssize_t" c:type="gssize"/>
+ <type name="gssize" c:type="gssize"/>
</parameter>
</parameters>
</function>
@@ -3009,7 +3009,7 @@ and/or use gtk-doc annotations. -->
direction="inout"
caller-allocates="0"
transfer-ownership="full">
- <type name="ssize_t" c:type="gssize*"/>
+ <type name="gssize" c:type="gssize*"/>
</parameter>
</parameters>
</function>
@@ -3023,7 +3023,7 @@ and/or use gtk-doc annotations. -->
direction="inout"
caller-allocates="0"
transfer-ownership="full">
- <type name="ssize_t" c:type="gssize*"/>
+ <type name="gssize" c:type="gssize*"/>
</parameter>
</parameters>
</function>
@@ -3037,7 +3037,7 @@ and/or use gtk-doc annotations. -->
direction="out"
caller-allocates="0"
transfer-ownership="full">
- <type name="ssize_t" c:type="gssize*"/>
+ <type name="gssize" c:type="gssize*"/>
</parameter>
</parameters>
</function>
@@ -3051,20 +3051,20 @@ and/or use gtk-doc annotations. -->
direction="out"
caller-allocates="0"
transfer-ownership="full">
- <type name="ssize_t" c:type="gssize*"/>
+ <type name="gssize" c:type="gssize*"/>
</parameter>
</parameters>
</function>
<function name="ssize_return_max"
c:identifier="g_i_marshalling_tests_ssize_return_max">
<return-value transfer-ownership="none">
- <type name="ssize_t" c:type="gssize"/>
+ <type name="gssize" c:type="gssize"/>
</return-value>
</function>
<function name="ssize_return_min"
c:identifier="g_i_marshalling_tests_ssize_return_min">
<return-value transfer-ownership="none">
- <type name="ssize_t" c:type="gssize"/>
+ <type name="gssize" c:type="gssize"/>
</return-value>
</function>
<function name="test_interface_test_int8_in"
@@ -3087,7 +3087,7 @@ and/or use gtk-doc annotations. -->
</return-value>
<parameters>
<parameter name="time_t_" transfer-ownership="none">
- <type name="time_t" c:type="time_t"/>
+ <type name="long" c:type="time_t"/>
</parameter>
</parameters>
</function>
@@ -3101,7 +3101,7 @@ and/or use gtk-doc annotations. -->
direction="inout"
caller-allocates="0"
transfer-ownership="full">
- <type name="time_t" c:type="time_t*"/>
+ <type name="long" c:type="time_t*"/>
</parameter>
</parameters>
</function>
@@ -3115,14 +3115,14 @@ and/or use gtk-doc annotations. -->
direction="out"
caller-allocates="0"
transfer-ownership="full">
- <type name="time_t" c:type="time_t*"/>
+ <type name="long" c:type="time_t*"/>
</parameter>
</parameters>
</function>
<function name="time_t_return"
c:identifier="g_i_marshalling_tests_time_t_return">
<return-value transfer-ownership="none">
- <type name="time_t" c:type="time_t"/>
+ <type name="long" c:type="time_t"/>
</return-value>
</function>
<function name="uint16_in" c:identifier="g_i_marshalling_tests_uint16_in">