diff options
| author | Federico Mena Quintero <federico@ximian.com> | 2005-11-22 21:38:41 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2005-11-22 21:38:41 +0000 |
| commit | 0f91602a3719ad4344712910a0cd825c58497a2b (patch) | |
| tree | f7875f364b22bd12389e5cb363910e12ebd81584 /pango/pangofc-font.h | |
| parent | 550026ab7e2d2cfeeacd1cd68ecb1ac31a4733e4 (diff) | |
| download | pango-0f91602a3719ad4344712910a0cd825c58497a2b.tar.gz | |
Fixes #322174:
2005-11-22 Federico Mena Quintero <federico@ximian.com>
Fixes #322174:
* pango/pangofc-font.h (struct _PangoFcFont): Replace the
"gpointer context_key" field with "gpointer priv". This way we
can access the private data quickly, instead of using
g_type_instance_get_private().
* pango/pangofc-private.h: Added prototypes for
_pango_fc_font_{get,set}_context_key().
* pango/pangofc-font.c (struct _PangoFcFontPrivate): Moved the
"context_key" field to here.
(PANGO_FC_FONT_GET_PRIVATE): Use the "priv" field instead of GType
private data.
(pango_fc_font_class_init): Don't register GType private data.
(pango_fc_font_init): Initialize the private data here.
(pango_fc_font_finalize): Free the private data.
(_pango_fc_font_get_context_key): Implement.
(_pango_fc_font_set_context_key): Implement.
(pango_fc_font_get_glyph): Remove the g_return_val_if_fail(); it
was appearing quite high in the profile.
* pango/pangofc-fontmap.c (pango_fc_font_map_add): Call
_pango_fc_font_set_context_key() instead of setting the
fcfont->context_key directly.
(_pango_fc_font_map_remove): Likewise; also use
_pango_fc_font_get_context_key() instead of accessing the field
directly.
Diffstat (limited to 'pango/pangofc-font.h')
| -rw-r--r-- | pango/pangofc-font.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pango/pangofc-font.h b/pango/pangofc-font.h index 404f6ad3..afc5e96b 100644 --- a/pango/pangofc-font.h +++ b/pango/pangofc-font.h @@ -71,7 +71,7 @@ struct _PangoFcFont FcPattern *font_pattern; /* fully resolved pattern */ PangoFontMap *fontmap; /* associated map */ - gpointer context_key; /* used internally */ + gpointer priv; /* used internally */ PangoMatrix matrix; /* used internally */ PangoFontDescription *description; |