From 4dcaa2b988239e01224994098c3e7cbe8b455fe0 Mon Sep 17 00:00:00 2001 From: Simon Feltman Date: Sat, 12 Oct 2013 16:40:58 -0700 Subject: cache refactoring: Move GObject arg setup and marshaling into new file Move GObject argument cache setup and marshaling fragments into isolated file: pygi-object.c. Break GIInterfaceCache creation and setup into API for interface based argument cache usage. https://bugzilla.gnome.org/show_bug.cgi?id=709700 --- gi/pygi-argument.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gi/pygi-argument.c') diff --git a/gi/pygi-argument.c b/gi/pygi-argument.c index c58afa37..4624e0f8 100644 --- a/gi/pygi-argument.c +++ b/gi/pygi-argument.c @@ -34,6 +34,7 @@ #include "pygi-marshal-from-py.h" #include "pygi-marshal-to-py.h" #include "pygi-basictype.h" +#include "pygi-object.h" static gboolean @@ -1063,7 +1064,7 @@ array_success: case GI_INFO_TYPE_INTERFACE: case GI_INFO_TYPE_OBJECT: /* An error within this call will result in a NULL arg */ - _pygi_marshal_from_py_gobject_out_arg (object, &arg, transfer); + pygi_arg_gobject_out_arg_from_py (object, &arg, transfer); break; default: @@ -1436,10 +1437,10 @@ _pygi_argument_to_object (GIArgument *arg, transfer == GI_TRANSFER_NOTHING && g_object_is_floating (arg->v_pointer)) { g_object_ref (arg->v_pointer); - object = _pygi_marshal_to_py_object (arg, GI_TRANSFER_EVERYTHING); + object = pygi_arg_gobject_to_py (arg, GI_TRANSFER_EVERYTHING); g_object_force_floating (arg->v_pointer); } else { - object = _pygi_marshal_to_py_object (arg, transfer); + object = pygi_arg_gobject_to_py (arg, transfer); } break; -- cgit v1.2.1