[gjs: 3/3] Merge branch 'cairo-conversion-bugs' into 'master'

[Cosimo Cecchi <cosimoc src gnome org>]

commit 0bdae3906d71861742c56535bd6fa9befc62238a
Merge: 1bedcf89 0038bf9a
Author: Cosimo Cecchi <cosimo cecchi gmail com>
Date:   Mon Apr 22 15:18:17 2019 +0000

    Merge branch 'cairo-conversion-bugs' into 'master'
    
    Cairo conversion bugs
    
    See merge request GNOME/gjs!286

 gi/arg.cpp                | 29 +++++++++++------------------
 gi/arg.h                  |  6 +++++-
 modules/cairo-context.cpp | 17 +++++++++++++++--
 modules/cairo-region.cpp  | 15 ++++++++++++++-
 modules/cairo-surface.cpp | 15 ++++++++++++++-
 5 files changed, 59 insertions(+), 23 deletions(-)
---