cairo: Add missing type_id attributes guarded by GOBJECT define

When Cairo is built with GObject support wrapper, it provides
cairo-gobject.h that defines GType and GBoxed structures and enums.

1 files changed, 196 insertions, 12 deletions

diff --git a/vapi/cairo.vapi b/vapi/cairo.vapi
index 06351c83c..64a995b62 100644
--- a/vapi/cairo.vapi
+++ b/vapi/cairo.vapi
@@ -20,7 +20,11 @@
  * 	Jürg Billeter <j@bitron.ch>
  */
 
+#if GOBJECT
+[CCode (cheader_filename = "cairo-gobject.h", gir_namespace = "cairo", gir_version = "1.0")]
+#else
 [CCode (cheader_filename = "cairo.h", gir_namespace = "cairo", gir_version = "1.0")]
+#endif
 namespace Cairo {
 	[CCode (lower_case_cprefix = "CAIRO_MIME_TYPE_")]
 	namespace MimeType {
@@ -37,7 +41,11 @@ namespace Cairo {
 		public const string UNIQUE_ID;
 		public const string URI;
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_t", cprefix = "cairo_", ref_function = "cairo_reference", unref_function = "cairo_destroy", type_id = "cairo_gobject_context_get_type ()")]
+#else
 	[CCode (cname = "cairo_t", cprefix = "cairo_", ref_function = "cairo_reference", unref_function = "cairo_destroy")]
+#endif
 	[Compact]
 	public class Context {
 		[CCode (cname = "cairo_create")]
@@ -152,7 +160,11 @@ namespace Cairo {
 		public void user_to_device (ref double x, ref double y);
 		public void user_to_device_distance (ref double dx, ref double dy);
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_device_t", ref_function = "cairo_device_reference", unref_function = "cairo_device_destroy", type_id = "cairo_gobject_device_get_type ()")]
+#else
 	[CCode (cname = "cairo_device_t", ref_function = "cairo_device_reference", unref_function = "cairo_device_destroy")]
+#endif
 	[Compact]
 	public class Device {
 		public Cairo.Status acquire ();
@@ -167,7 +179,11 @@ namespace Cairo {
 		public Cairo.Status set_user_data<G> (Cairo.UserDataKey? key, owned G? data);
 		public Cairo.Status status ();
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_device_t", ref_function = "cairo_device_reference", unref_function = "cairo_device_destroy", type_id = "cairo_gobject_device_get_type ()")]
+#else
 	[CCode (cname = "cairo_device_t", ref_function = "cairo_device_reference", unref_function = "cairo_device_destroy")]
+#endif
 	[Compact]
 	public class DeviceObserver {
 		protected DeviceObserver ();
@@ -179,7 +195,11 @@ namespace Cairo {
 		public Cairo.Status print (Cairo.WriteFunc write_func);
 		public double stroke_elapsed ();
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_font_face_t", ref_function = "cairo_font_face_reference", unref_function = "cairo_font_face_destroy", type_id = "cairo_gobject_font_face_get_type ()")]
+#else
 	[CCode (cname = "cairo_font_face_t", ref_function = "cairo_font_face_reference", unref_function = "cairo_font_face_destroy")]
+#endif
 	[Compact]
 	public class FontFace {
 		public uint get_reference_count ();
@@ -190,7 +210,11 @@ namespace Cairo {
 		public Cairo.Status set_user_data<G> (Cairo.UserDataKey? key, owned G? data);
 		public Cairo.Status status ();
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_font_options_t", copy_function = "cairo_font_options_copy", free_function = "cairo_font_options_destroy", type_id = "cairo_gobject_font_options_get_type ()")]
+#else
 	[CCode (cname = "cairo_font_options_t", copy_function = "cairo_font_options_copy", free_function = "cairo_font_options_destroy")]
+#endif
 	[Compact]
 	public class FontOptions {
 		[CCode (cname = "cairo_font_options_create")]
@@ -212,7 +236,11 @@ namespace Cairo {
 		public void set_variations (string? variations);
 		public Cairo.Status status ();
 	}
-	[CCode (cname = "cairo_surface_t")]
+#if GOBJECT
+	[CCode (cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy", type_id = "cairo_gobject_surface_get_type ()")]
+#else
+	[CCode (cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy")]
+#endif
 	[Compact]
 	public class ImageSurface : Cairo.Surface {
 		[CCode (cname = "cairo_image_surface_create")]
@@ -230,7 +258,11 @@ namespace Cairo {
 		public int get_stride ();
 		public int get_width ();
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_pattern_t", ref_function = "cairo_pattern_reference", unref_function = "cairo_pattern_destroy", type_id = "cairo_gobject_pattern_get_type ()")]
+#else
 	[CCode (cname = "cairo_pattern_t", ref_function = "cairo_pattern_reference", unref_function = "cairo_pattern_destroy")]
+#endif
 	[Compact]
 	public class MeshPattern : Cairo.Pattern {
 		[CCode (cname = "cairo_pattern_create_mesh")]
@@ -248,7 +280,7 @@ namespace Cairo {
 		public void set_corner_color_rgb (uint corner_num, double red, double green, double blue);
 		public void set_corner_color_rgba (uint corner_num, double red, double green, double blue, double alpha);
 	}
-	[CCode (cname = "cairo_path_t", free_function = "cairo_path_destroy")]
+	[CCode (cname = "cairo_path_t", free_function = "cairo_path_destroy", has_type_id = false)]
 	[Compact]
 	public class Path {
 		[CCode (array_length = false)]
@@ -256,7 +288,11 @@ namespace Cairo {
 		public int num_data;
 		public Cairo.Status status;
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_pattern_t", ref_function = "cairo_pattern_reference", unref_function = "cairo_pattern_destroy", type_id = "cairo_gobject_pattern_get_type ()")]
+#else
 	[CCode (cname = "cairo_pattern_t", ref_function = "cairo_pattern_reference", unref_function = "cairo_pattern_destroy")]
+#endif
 	[Compact]
 	public class Pattern {
 		public void add_color_stop_rgb (double offset, double red, double green, double blue);
@@ -288,7 +324,11 @@ namespace Cairo {
 		public Cairo.Status set_user_data<G> (Cairo.UserDataKey? key, owned G? data);
 		public Cairo.Status status ();
 	}
-	[CCode (cheader_filename = "cairo-pdf.h", cname = "cairo_surface_t")]
+#if GOBJECT
+	[CCode (cheader_filename = "cairo-pdf.h,cairo-gobject.h", cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy", type_id = "cairo_gobject_surface_get_type ()")]
+#else
+	[CCode (cheader_filename = "cairo-pdf.h", cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy")]
+#endif
 	[Compact]
 	public class PdfSurface : Cairo.Surface {
 		[CCode (cname = "cairo_pdf_surface_create")]
@@ -306,7 +346,11 @@ namespace Cairo {
 		[Version (since = "1.16")]
 		public void set_thumbnail_size (int width, int height);
 	}
-	[CCode (cheader_filename = "cairo-ps.h", cname = "cairo_surface_t")]
+#if GOBJECT
+	[CCode (cheader_filename = "cairo-ps.h,cairo-gobject.h", cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy", type_id = "cairo_gobject_surface_get_type ()")]
+#else
+	[CCode (cheader_filename = "cairo-ps.h", cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy")]
+#endif
 	[Compact]
 	public class PsSurface : Cairo.Surface {
 		[CCode (cname = "cairo_ps_surface_create")]
@@ -322,7 +366,11 @@ namespace Cairo {
 		public void set_eps (bool eps);
 		public void set_size (double width_in_points, double height_in_points);
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_pattern_t", ref_function = "cairo_pattern_reference", unref_function = "cairo_pattern_destroy", type_id = "cairo_gobject_pattern_get_type ()")]
+#else
 	[CCode (cname = "cairo_pattern_t", ref_function = "cairo_pattern_reference", unref_function = "cairo_pattern_destroy")]
+#endif
 	[Compact]
 	public class RasterSourcePattern : Cairo.Pattern {
 		[CCode (cname = "cairo_pattern_create_raster_source")]
@@ -338,7 +386,11 @@ namespace Cairo {
 		public void set_finish (Cairo.RasterSourceFinishFunc finish);
 		public void set_snapshot (Cairo.RasterSourceSnapshotFunc snapshot);
 	}
-	[CCode (cname = "cairo_surface_t")]
+#if GOBJECT
+	[CCode (cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy", type_id = "cairo_gobject_surface_get_type ()")]
+#else
+	[CCode (cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy")]
+#endif
 	[Compact]
 	public class RecordingSurface : Cairo.Surface {
 		[CCode (cname = "cairo_recording_surface_create")]
@@ -346,14 +398,18 @@ namespace Cairo {
 		public bool get_extents (out Cairo.Rectangle extents);
 		public void ink_extents (out double x0, out double y0, out double width, out double height);
 	}
-	[CCode (cname = "cairo_rectangle_list_t", free_function = "cairo_rectangle_list_destroy")]
+	[CCode (cname = "cairo_rectangle_list_t", free_function = "cairo_rectangle_list_destroy", has_type_id = false)]
 	[Compact]
 	public class RectangleList {
 		[CCode (array_length_cname = "num_rectangles")]
 		public Cairo.Rectangle[] rectangles;
 		public Cairo.Status status;
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_region_t", ref_function = "cairo_region_reference", unref_function = "cairo_region_destroy", type_id = "cairo_gobject_region_get_type ()")]
+#else
 	[CCode (cname = "cairo_region_t", ref_function = "cairo_region_reference", unref_function = "cairo_region_destroy")]
+#endif
 	[Compact]
 	public class Region {
 		[CCode (cname = "cairo_region_create")]
@@ -381,7 +437,11 @@ namespace Cairo {
 		public Cairo.Status xor (Cairo.Region other);
 		public Cairo.Status xor_rectangle (Cairo.RectangleInt rectangle);
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_scaled_font_t", ref_function = "cairo_scaled_font_reference", unref_function = "cairo_scaled_font_destroy", type_id = "cairo_gobject_scaled_font_get_type ()")]
+#else
 	[CCode (cname = "cairo_scaled_font_t", ref_function = "cairo_scaled_font_reference", unref_function = "cairo_scaled_font_destroy")]
+#endif
 	[Compact]
 	public class ScaledFont {
 		[CCode (cname = "cairo_scaled_font_create")]
@@ -407,7 +467,7 @@ namespace Cairo {
 		[CCode (cname = "cairo_win32_scaled_font_get_logical_to_device")]
 		public Cairo.Matrix win32_get_logical_to_device ();
 	}
-	[CCode (cname = "cairo_device_t", ref_function = "cairo_device_reference", unref_function = "cairo_device_destroy")]
+	[CCode (cname = "cairo_device_t", ref_function = "cairo_device_reference", unref_function = "cairo_device_destroy", has_type_id = false)]
 	[Compact]
 	public class Script : Cairo.Device {
 		[CCode (cname = "cairo_script_create")]
@@ -420,7 +480,11 @@ namespace Cairo {
 		public void set_mode (Cairo.ScriptMode mode);
 		public void write_comment (string comment, int len = -1);
 	}
-	[CCode (cheader_filename = "cairo-svg.h", cname = "cairo_surface_t")]
+#if GOBJECT
+	[CCode (cheader_filename = "cairo-svg.h,cairo-gobject.h", cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy", type_id = "cairo_gobject_surface_get_type ()")]
+#else
+	[CCode (cheader_filename = "cairo-svg.h", cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy")]
+#endif
 	[Compact]
 	public class ScriptSurface : Cairo.Surface {
 		[CCode (cname = "cairo_script_surface_create")]
@@ -428,7 +492,11 @@ namespace Cairo {
 		[CCode (cname = "cairo_script_surface_create_for_target")]
 		public ScriptSurface.for_target (Cairo.Script script, Cairo.Surface target);
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy", type_id = "cairo_gobject_surface_get_type ()")]
+#else
 	[CCode (cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy")]
+#endif
 	[Compact]
 	public class Surface {
 		public void copy_page ();
@@ -468,7 +536,11 @@ namespace Cairo {
 		public Cairo.Status write_to_png (string filename);
 		public Cairo.Status write_to_png_stream (Cairo.WriteFunc write_func);
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy", type_id = "cairo_gobject_surface_get_type ()")]
+#else
 	[CCode (cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy")]
+#endif
 	[Compact]
 	public class SurfaceObserver {
 		[CCode (cname = "cairo_surface_create_observer")]
@@ -483,7 +555,11 @@ namespace Cairo {
 		public double elapsed ();
 		public Cairo.Status print (Cairo.WriteFunc write_func);
 	}
-	[CCode (cheader_filename = "cairo-svg.h", cname = "cairo_surface_t")]
+#if GOBJECT
+	[CCode (cheader_filename = "cairo-svg.h,cairo-gobject.h", cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy", type_id = "cairo_gobject_surface_get_type ()")]
+#else
+	[CCode (cheader_filename = "cairo-svg.h", cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy")]
+#endif
 	[Compact]
 	public class SvgSurface : Cairo.Surface {
 		[CCode (cname = "cairo_svg_surface_create")]
@@ -496,7 +572,7 @@ namespace Cairo {
 		[Version (since = "1.16")]
 		public void set_document_unit (Cairo.SvgUnit unit);
 	}
-	[CCode (cname = "cairo_font_face_t", ref_function = "cairo_font_face_reference", unref_function = "cairo_font_face_destroy")]
+	[CCode (cname = "cairo_font_face_t", ref_function = "cairo_font_face_reference", unref_function = "cairo_font_face_destroy", has_type_id = false)]
 	[Compact]
 	public class ToyFontFace : Cairo.FontFace {
 		[CCode (cname = "cairo_toy_font_face_create")]
@@ -505,7 +581,7 @@ namespace Cairo {
 		public Cairo.FontSlant get_slant ();
 		public Cairo.FontWeight get_weight ();
 	}
-	[CCode (cname = "cairo_font_face_t", ref_function = "cairo_font_face_reference", unref_function = "cairo_font_face_destroy")]
+	[CCode (cname = "cairo_font_face_t", ref_function = "cairo_font_face_reference", unref_function = "cairo_font_face_destroy", has_type_id = false)]
 	[Compact]
 	public class UserFontFace : Cairo.FontFace {
 		[CCode (cname = "cairo_user_font_face_create")]
@@ -519,11 +595,19 @@ namespace Cairo {
 		public void set_text_to_glyphs_func (Cairo.UserScaledFontTextToGlyphsFunc text_to_glyphs_func);
 		public void set_unicode_to_glyph_func (Cairo.UserScaledFontUnicodeToGlyphFunc unicode_to_glyph_func);
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_scaled_font_t", ref_function = "cairo_scaled_font_reference", unref_function = "cairo_scaled_font_destroy", type_id = "cairo_gobject_scaled_font_get_type ()")]
+#else
 	[CCode (cname = "cairo_scaled_font_t", ref_function = "cairo_scaled_font_reference", unref_function = "cairo_scaled_font_destroy")]
+#endif
 	[Compact]
 	public class UserScaledFont {
 	}
-	[CCode (cheader_filename = "cairo-xlib.h", cname = "cairo_surface_t")]
+#if GOBJECT
+	[CCode (cheader_filename = "cairo-xlib.h,cairo-gobject.h", cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy", type_id = "cairo_gobject_surface_get_type ()")]
+#else
+	[CCode (cheader_filename = "cairo-xlib.h", cname = "cairo_surface_t", ref_function = "cairo_surface_reference", unref_function = "cairo_surface_destroy")]
+#endif
 	[Compact]
 	public class XlibSurface : Cairo.Surface {
 		[CCode (cname = "cairo_xlib_surface_create")]
@@ -554,7 +638,11 @@ namespace Cairo {
 		public double x;
 		public double y;
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_matrix_t", type_id = "cairo_gobject_matrix_get_type ()")]
+#else
 	[CCode (cname = "cairo_matrix_t", has_type_id = false)]
+#endif
 	public struct Matrix {
 		public double xx;
 		public double yx;
@@ -589,14 +677,22 @@ namespace Cairo {
 		public double x;
 		public double y;
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_rectangle_t", type_id = "cairo_gobject_rectangle_get_type ()")]
+#else
 	[CCode (cname = "cairo_rectangle_t", has_type_id = false)]
+#endif
 	public struct Rectangle {
 		public double x;
 		public double y;
 		public double width;
 		public double height;
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_rectangle_int_t", type_id = "cairo_gobject_rectangle_int_get_type ()")]
+#else
 	[CCode (cname = "cairo_rectangle_int_t", has_type_id = false)]
+#endif
 	public struct RectangleInt {
 		public int x;
 		public int y;
@@ -620,7 +716,11 @@ namespace Cairo {
 	[CCode (cname = "cairo_user_data_key_t", has_copy_function = false, has_destroy_function = false, has_type_id = false, lvalue_access = false)]
 	public struct UserDataKey {
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_antialias_t", type_id = "cairo_gobject_antialias_get_type ()")]
+#else
 	[CCode (cname = "cairo_antialias_t", has_type_id = false)]
+#endif
 	public enum Antialias {
 		DEFAULT,
 		NONE,
@@ -630,13 +730,21 @@ namespace Cairo {
 		GOOD,
 		BEST
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_content_t", type_id = "cairo_gobject_content_get_type ()")]
+#else
 	[CCode (cname = "cairo_content_t", has_type_id = false)]
+#endif
 	public enum Content {
 		COLOR,
 		ALPHA,
 		COLOR_ALPHA
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_device_type_t", type_id = "cairo_gobject_device_type_get_type ()")]
+#else
 	[CCode (cname = "cairo_device_type_t", has_type_id = false)]
+#endif
 	public enum DeviceType {
 		DRM,
 		GL,
@@ -647,19 +755,31 @@ namespace Cairo {
 		COGL,
 		WIN32
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_extend_t", type_id = "cairo_gobject_extend_get_type ()")]
+#else
 	[CCode (cname = "cairo_extend_t", has_type_id = false)]
+#endif
 	public enum Extend {
 		NONE,
 		REPEAT,
 		REFLECT,
 		PAD
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_fill_rule_t", type_id = "cairo_gobject_fill_rule_get_type ()")]
+#else
 	[CCode (cname = "cairo_fill_rule_t", has_type_id = false)]
+#endif
 	public enum FillRule {
 		WINDING,
 		EVEN_ODD
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_filter_t", type_id = "cairo_gobject_filter_get_type ()")]
+#else
 	[CCode (cname = "cairo_filter_t", has_type_id = false)]
+#endif
 	public enum Filter {
 		FAST,
 		GOOD,
@@ -668,13 +788,21 @@ namespace Cairo {
 		BILINEAR,
 		GAUSSIAN
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_font_slant_t", type_id = "cairo_gobject_font_slant_get_type ()")]
+#else
 	[CCode (cname = "cairo_font_slant_t", has_type_id = false)]
+#endif
 	public enum FontSlant {
 		NORMAL,
 		ITALIC,
 		OBLIQUE
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_font_type_t", type_id = "cairo_gobject_font_type_get_type ()")]
+#else
 	[CCode (cname = "cairo_font_type_t", has_type_id = false)]
+#endif
 	public enum FontType {
 		TOY,
 		FT,
@@ -682,12 +810,20 @@ namespace Cairo {
 		QUARTZ,
 		USER
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_font_weight_t", type_id = "cairo_gobject_font_weight_get_type ()")]
+#else
 	[CCode (cname = "cairo_font_weight_t", has_type_id = false)]
+#endif
 	public enum FontWeight {
 		NORMAL,
 		BOLD
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_format_t", type_id = "cairo_gobject_format_get_type ()")]
+#else
 	[CCode (cname = "cairo_format_t", has_type_id = false)]
+#endif
 	public enum Format {
 		ARGB32,
 		RGB24,
@@ -697,13 +833,21 @@ namespace Cairo {
 		RGB30;
 		public int stride_for_width (int width);
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_hint_metrics_t", type_id = "cairo_gobject_hint_metrics_get_type ()")]
+#else
 	[CCode (cname = "cairo_hint_metrics_t", has_type_id = false)]
+#endif
 	public enum HintMetrics {
 		DEFAULT,
 		OFF,
 		ON
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_hint_style_t", type_id = "cairo_gobject_hint_style_get_type ()")]
+#else
 	[CCode (cname = "cairo_hint_style_t", has_type_id = false)]
+#endif
 	public enum HintStyle {
 		DEFAULT,
 		NONE,
@@ -711,19 +855,31 @@ namespace Cairo {
 		MEDIUM,
 		FULL
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_line_cap_t", type_id = "cairo_gobject_line_cap_get_type ()")]
+#else
 	[CCode (cname = "cairo_line_cap_t", has_type_id = false)]
+#endif
 	public enum LineCap {
 		BUTT,
 		ROUND,
 		SQUARE
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_line_join_t", type_id = "cairo_gobject_line_join_get_type ()")]
+#else
 	[CCode (cname = "cairo_line_join_t", has_type_id = false)]
+#endif
 	public enum LineJoin {
 		MITER,
 		ROUND,
 		BEVEL
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_operator_t", type_id = "cairo_gobject_operator_get_type ()")]
+#else
 	[CCode (cname = "cairo_operator_t", has_type_id = false)]
+#endif
 	public enum Operator {
 		CLEAR,
 		SOURCE,
@@ -755,14 +911,22 @@ namespace Cairo {
 		HSL_COLOR,
 		HSL_LUMINOSITY
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_path_data_type_t", cprefix = "CAIRO_PATH_", type_id = "cairo_gobject_path_data_type_get_type ()")]
+#else
 	[CCode (cname = "cairo_path_data_type_t", cprefix = "CAIRO_PATH_", has_type_id = false)]
+#endif
 	public enum PathDataType {
 		MOVE_TO,
 		LINE_TO,
 		CURVE_TO,
 		CLOSE_PATH
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_pattern_type_t", type_id = "cairo_gobject_pattern_type_get_type ()")]
+#else
 	[CCode (cname = "cairo_pattern_type_t", has_type_id = false)]
+#endif
 	public enum PatternType {
 		SOLID,
 		SURFACE,
@@ -807,7 +971,11 @@ namespace Cairo {
 		[CCode (cname = "cairo_ps_get_levels")]
 		public static void get_levels (out unowned Cairo.PsLevel[] levels);
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_region_overlap_t", type_id = "cairo_gobject_region_overlap_get_type ()")]
+#else
 	[CCode (cname = "cairo_region_overlap_t", has_type_id = false)]
+#endif
 	public enum RegionOverlap {
 		IN,
 		OUT,
@@ -818,7 +986,11 @@ namespace Cairo {
 		ASCII,
 		BINARY
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_status_t", type_id = "cairo_gobject_status_get_type ()")]
+#else
 	[CCode (cname = "cairo_status_t", has_type_id = false)]
+#endif
 	public enum Status {
 		SUCCESS,
 		NO_MEMORY,
@@ -867,7 +1039,11 @@ namespace Cairo {
 		[CCode (cname = "cairo_status_to_string")]
 		public unowned string to_string ();
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_subpixel_order_t", type_id = "cairo_gobject_subpixel_order_get_type ()")]
+#else
 	[CCode (cname = "cairo_subpixel_order_t", has_type_id = false)]
+#endif
 	public enum SubpixelOrder {
 		DEFAULT,
 		RGB,
@@ -880,7 +1056,11 @@ namespace Cairo {
 		NORMAL,
 		RECORD_OPERATIONS
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_surface_type_t", type_id = "cairo_gobject_surface_type_get_type ()")]
+#else
 	[CCode (cname = "cairo_surface_type_t", has_type_id = false)]
+#endif
 	public enum SurfaceType {
 		IMAGE,
 		PDF,
@@ -931,7 +1111,11 @@ namespace Cairo {
 		[CCode (cname = "cairo_svg_get_versions")]
 		public static void get_versions (out unowned Cairo.SvgVersion[] versions);
 	}
+#if GOBJECT
+	[CCode (cname = "cairo_text_cluster_flags_t", cprefix = "CAIRO_TEXT_CLUSTER_FLAG_", type_id = "cairo_gobject_text_cluster_flags_get_type ()")]
+#else
 	[CCode (cname = "cairo_text_cluster_flags_t", cprefix = "CAIRO_TEXT_CLUSTER_FLAG_", has_type_id = false)]
+#endif
 	public enum TextClusterFlags {
 		BACKWARD
 	}