diff options
| author | Tommi Komulainen <tommi.komulainen@iki.fi> | 2008-10-22 14:02:02 +0000 |
|---|---|---|
| committer | Tommi Komulainen <tko@src.gnome.org> | 2008-10-22 14:02:02 +0000 |
| commit | dc6518128a6d25c97e8e6801961700c15b6d68fa (patch) | |
| tree | d8312f1df45b2a7e57a609d4e41687cc587a43dd /girepository/girnode.c | |
| parent | 7b171be482d33af3f4a6afa6bf34b433ce70fdb1 (diff) | |
| download | gobject-introspection-dc6518128a6d25c97e8e6801961700c15b6d68fa.tar.gz | |
Bug 557405 – Use 'allow-none' consistently
2008-10-22 Tommi Komulainen <tommi.komulainen@iki.fi>
* docs/typelib-format.txt:
* girepository/ginfo.c (g_arg_info_may_be_null):
* girepository/girnode.c (g_ir_node_build_typelib):
* girepository/girnode.h (struct _GIrNodeParam):
* girepository/girparser.c (start_parameter):
* girepository/girwriter.c (function_generate):
* girepository/gtypelib.h (ArgBlob):
* tests/errors.gir:
* tests/function.gir:
* tools/generate.c (write_callable_info): Use 'allow-none'
consistently throughout
svn path=/trunk/; revision=782
Diffstat (limited to 'girepository/girnode.c')
| -rw-r--r-- | girepository/girnode.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/girepository/girnode.c b/girepository/girnode.c index e6fc799d..7b68e0c4 100644 --- a/girepository/girnode.c +++ b/girepository/girnode.c @@ -1489,7 +1489,7 @@ g_ir_node_build_typelib (GIrNode *node, module, modules, strings, types, data, &signature, offset2); - blob2->may_return_null = function->result->null_ok; + blob2->may_return_null = function->result->allow_none; blob2->caller_owns_return_value = function->result->transfer; blob2->caller_owns_return_container = function->result->shallow_transfer; blob2->reserved = 0; @@ -1533,7 +1533,7 @@ g_ir_node_build_typelib (GIrNode *node, module, modules, strings, types, data, &signature, offset2); - blob2->may_return_null = function->result->null_ok; + blob2->may_return_null = function->result->allow_none; blob2->caller_owns_return_value = function->result->transfer; blob2->caller_owns_return_container = function->result->shallow_transfer; blob2->reserved = 0; @@ -1585,7 +1585,7 @@ g_ir_node_build_typelib (GIrNode *node, module, modules, strings, types, data, &signature, offset2); - blob2->may_return_null = signal->result->null_ok; + blob2->may_return_null = signal->result->allow_none; blob2->caller_owns_return_value = signal->result->transfer; blob2->caller_owns_return_container = signal->result->shallow_transfer; blob2->reserved = 0; @@ -1632,7 +1632,7 @@ g_ir_node_build_typelib (GIrNode *node, module, modules, strings, types, data, &signature, offset2); - blob2->may_return_null = vfunc->result->null_ok; + blob2->may_return_null = vfunc->result->allow_none; blob2->caller_owns_return_value = vfunc->result->transfer; blob2->caller_owns_return_container = vfunc->result->shallow_transfer; blob2->reserved = 0; @@ -1661,7 +1661,7 @@ g_ir_node_build_typelib (GIrNode *node, blob->in = param->in; blob->out = param->out; blob->dipper = param->dipper; - blob->null_ok = param->null_ok; + blob->allow_none = param->allow_none; blob->optional = param->optional; blob->transfer_ownership = param->transfer; blob->transfer_container_ownership = param->shallow_transfer; |