[gjs: 2/2] Merge branch 'ewlsh/refactor-prototype-resolution' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 7aea8f1e197ad5bdabff730f6ab8d854cfca5567
Merge: e729fddd b136c351
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Jan 9 20:13:55 2022 +0000

    Merge branch 'ewlsh/refactor-prototype-resolution' into 'master'
    
    gi: Refactor resolving prototypes in GIWrapperInstance constructors
    
    See merge request GNOME/gjs!699

 gi/boxed.cpp       |  4 ++--
 gi/boxed.h         |  2 +-
 gi/fundamental.cpp |  5 ++--
 gi/fundamental.h   |  3 ++-
 gi/gerror.cpp      |  4 ++--
 gi/gerror.h        |  2 +-
 gi/interface.h     |  5 ++--
 gi/object.cpp      | 30 ++++++++++++++++-------
 gi/object.h        |  3 ++-
 gi/union.cpp       |  4 ++--
 gi/union.h         |  2 +-
 gi/wrapperutils.h  | 70 +++++++++++++++++++++++++++++++++++++++++-------------
 12 files changed, 93 insertions(+), 41 deletions(-)
---