diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-07-12 08:41:54 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-07-12 08:41:58 +0900 |
| commit | 4bfc3de521c8d93613e5153028da35406609a64f (patch) | |
| tree | 98175ed0ab42bc56bec3d45d69364a988a00de1f /gi/pygi-argument.c | |
| parent | 5a89ec21697bd9e08c9102b2a7b6c60b4652e66c (diff) | |
| download | pygobject2-4bfc3de521c8d93613e5153028da35406609a64f.tar.gz pygobject2-4bfc3de521c8d93613e5153028da35406609a64f.tar.bz2 pygobject2-4bfc3de521c8d93613e5153028da35406609a64f.zip | |
Imported Upstream version 3.13.2
Change-Id: Icce9be2c1bf0568fc95f75ff0a714c017e6171ec
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'gi/pygi-argument.c')
| -rw-r--r-- | gi/pygi-argument.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/gi/pygi-argument.c b/gi/pygi-argument.c index 4094c3d..15be78c 100644 --- a/gi/pygi-argument.c +++ b/gi/pygi-argument.c @@ -33,7 +33,7 @@ #include "pygi-basictype.h" #include "pygi-object.h" #include "pygi-struct-marshal.h" - +#include "pygi-error.h" static gboolean gi_argument_to_gssize (GIArgument *arg_in, @@ -1029,16 +1029,16 @@ array_success: * Further re-factoring is needed to fix this leak. * See: https://bugzilla.gnome.org/show_bug.cgi?id=693405 */ - _pygi_marshal_from_py_interface_struct (object, - &arg, - NULL, /*arg_name*/ - info, /*interface_info*/ - g_type, - py_type, - transfer, - FALSE, /*copy_reference*/ - g_struct_info_is_foreign (info), - g_type_info_is_pointer (type_info)); + pygi_arg_struct_from_py_marshal (object, + &arg, + NULL, /*arg_name*/ + info, /*interface_info*/ + g_type, + py_type, + transfer, + FALSE, /*copy_reference*/ + g_struct_info_is_foreign (info), + g_type_info_is_pointer (type_info)); Py_DECREF (py_type); break; @@ -1372,13 +1372,13 @@ _pygi_argument_to_object (GIArgument *arg, py_type = _pygi_type_get_from_g_type (g_type); } - object = _pygi_marshal_to_py_interface_struct (arg, - info, /*interface_info*/ - g_type, - py_type, - transfer, - FALSE, /*is_allocated*/ - g_struct_info_is_foreign (info)); + object = pygi_arg_struct_to_py_marshal (arg, + info, /*interface_info*/ + g_type, + py_type, + transfer, + FALSE, /*is_allocated*/ + g_struct_info_is_foreign (info)); Py_XDECREF (py_type); break; @@ -1558,12 +1558,12 @@ _pygi_argument_to_object (GIArgument *arg, GError *error = (GError *) arg->v_pointer; if (error != NULL && transfer == GI_TRANSFER_NOTHING) { /* If we have not been transferred the ownership we must copy - * the error, because pyglib_error_check() is going to free it. + * the error, because pygi_error_check() is going to free it. */ error = g_error_copy (error); } - if (pyglib_error_check (&error)) { + if (pygi_error_check (&error)) { PyObject *err_type; PyObject *err_value; PyObject *err_trace; |