diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | pango/pangofc-fontmap.c | 15 |
6 files changed, 31 insertions, 14 deletions
@@ -1,3 +1,9 @@ +Mon Mar 1 09:43:38 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.c (pango_fc_font_map_finalize): + Remove the INSTANCE_PRIVATE_DATA_WORKS #ifdefs, + since it does work now. + Sun Feb 29 15:54:51 2004 Owen Taylor <otaylor@redhat.com> * pango/pangowin32.c pango/pangox.c pango/pangoft2.c: diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index f3273749..5fc049cd 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Mon Mar 1 09:43:38 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.c (pango_fc_font_map_finalize): + Remove the INSTANCE_PRIVATE_DATA_WORKS #ifdefs, + since it does work now. + Sun Feb 29 15:54:51 2004 Owen Taylor <otaylor@redhat.com> * pango/pangowin32.c pango/pangox.c pango/pangoft2.c: diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index f3273749..5fc049cd 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Mon Mar 1 09:43:38 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.c (pango_fc_font_map_finalize): + Remove the INSTANCE_PRIVATE_DATA_WORKS #ifdefs, + since it does work now. + Sun Feb 29 15:54:51 2004 Owen Taylor <otaylor@redhat.com> * pango/pangowin32.c pango/pangox.c pango/pangoft2.c: diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index f3273749..5fc049cd 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Mon Mar 1 09:43:38 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.c (pango_fc_font_map_finalize): + Remove the INSTANCE_PRIVATE_DATA_WORKS #ifdefs, + since it does work now. + Sun Feb 29 15:54:51 2004 Owen Taylor <otaylor@redhat.com> * pango/pangowin32.c pango/pangox.c pango/pangoft2.c: diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index f3273749..5fc049cd 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Mon Mar 1 09:43:38 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.c (pango_fc_font_map_finalize): + Remove the INSTANCE_PRIVATE_DATA_WORKS #ifdefs, + since it does work now. + Sun Feb 29 15:54:51 2004 Owen Taylor <otaylor@redhat.com> * pango/pangowin32.c pango/pangox.c pango/pangoft2.c: diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 9f265e16..db17e49c 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -27,9 +27,6 @@ #include "pangofc-private.h" #include "modules.h" -/* Currently broken */ -#undef INSTANCE_PRIVATE_DATA_WORKS - typedef struct _PangoFcCoverageKey PangoFcCoverageKey; typedef struct _PangoFcFace PangoFcFace; typedef struct _PangoFcFamily PangoFcFamily; @@ -164,13 +161,9 @@ pango_fc_font_map_init (PangoFcFontMap *fcfontmap) static gboolean registered_modules = FALSE; PangoFcFontMapPrivate *priv = fcfontmap->priv; -#if INSTANCE_PRIVATE_DATA_WORKS priv = fcfontmap->priv = G_TYPE_INSTANCE_GET_PRIVATE (fcfontmap, PANGO_TYPE_FC_FONT_MAP, PangoFcFontMapPrivate); -#else - priv = fcfontmap->priv = g_new0 (PangoFcFontMapPrivate, 1); -#endif if (!registered_modules) { @@ -205,9 +198,7 @@ pango_fc_font_map_class_init (PangoFontMapClass *class) class->list_families = pango_fc_font_map_list_families; class->shape_engine_type = PANGO_RENDER_TYPE_FC; -#ifdef INSTANCE_PRIVATE_DATA_WORKS - g_type_class_add_private (object_class, sizeof (PangoFontMapClass)); -#endif + g_type_class_add_private (object_class, sizeof (PangoFontMapPrivate)); } static guint @@ -355,10 +346,6 @@ pango_fc_font_map_finalize (GObject *object) if (priv->pattern_hash) g_hash_table_destroy (priv->pattern_hash); -#ifndef INSTANCE_PRIVATE_DATA_WORKS - g_free (priv); -#endif - G_OBJECT_CLASS (parent_class)->finalize (object); } |