diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2011-06-17 15:42:16 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2011-06-17 15:42:16 -0400 |
| commit | 0b469b7eeb36ce8181b404f24eaaacaa9ec2c3fe (patch) | |
| tree | b89838087398df711b6b88337d67eac7eb02e7b8 /pango/pangocairo-context.c | |
| parent | 7f9f7184286d584398603e449271d8bbd0e2e101 (diff) | |
| parent | 26092c20b0936ff669513fbd64537123b99d036e (diff) | |
| download | pango-0b469b7eeb36ce8181b404f24eaaacaa9ec2c3fe.tar.gz | |
Merge branch 'master' into harfbuzz-ng-external
Conflicts:
configure.in
pango/opentype/hb-common.h
pango/pango-ot-info.c
Diffstat (limited to 'pango/pangocairo-context.c')
| -rw-r--r-- | pango/pangocairo-context.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pango/pangocairo-context.c b/pango/pangocairo-context.c index 69432f04..df1b889a 100644 --- a/pango/pangocairo-context.c +++ b/pango/pangocairo-context.c @@ -260,7 +260,7 @@ pango_cairo_context_set_font_options (PangoContext *context, * * Since: 1.10 **/ -G_CONST_RETURN cairo_font_options_t * +const cairo_font_options_t * pango_cairo_context_get_font_options (PangoContext *context) { PangoCairoContextInfo *info; @@ -286,7 +286,7 @@ pango_cairo_context_get_font_options (PangoContext *context) * Return value: the combined set of font options. This value is owned * by the context and must not be modified or freed. **/ -G_CONST_RETURN cairo_font_options_t * +const cairo_font_options_t * _pango_cairo_context_get_merged_font_options (PangoContext *context) { PangoCairoContextInfo *info = get_context_info (context, TRUE); @@ -340,7 +340,7 @@ pango_cairo_context_set_shape_renderer (PangoContext *context, } /** - * pango_cairo_context_get_shape_renderer: + * pango_cairo_context_get_shape_renderer: (skip) * @context: a #PangoContext, from a pangocairo font map * @data: Pointer to #gpointer to return user data * @@ -394,7 +394,7 @@ pango_cairo_context_get_shape_renderer (PangoContext *context, * create a layout for use with @cr and do not need to access #PangoContext * directly, you can use pango_cairo_create_layout() instead. * - * Return value: the newly created #PangoContext. Free with + * Return value: (transfer full): the newly created #PangoContext. Free with * g_object_unref(). * * Since: 1.22 @@ -430,7 +430,7 @@ pango_cairo_create_context (cairo_t *cr) * #PangoContext object for each layout. This might matter in an * application that was laying out large amounts of text. * - * Return value: the newly created #PangoLayout. Free with + * Return value: (transfer full): the newly created #PangoLayout. Free with * g_object_unref(). * * Since: 1.10 |