From 17a36cd568219f8684962c274cd4832ad0feb1b2 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Wed, 7 Mar 2001 14:33:53 +0000 Subject: fixed up g_boxed_type_register_static() since GLib signature changed. Wed Mar 7 09:21:14 2001 Tim Janik * pango/pango-attributes.c: fixed up g_boxed_type_register_static() since GLib signature changed. * got rid of bogus g_type_init() calls. --- ChangeLog | 7 +++++++ ChangeLog.pre-1-0 | 7 +++++++ ChangeLog.pre-1-10 | 7 +++++++ ChangeLog.pre-1-2 | 7 +++++++ ChangeLog.pre-1-4 | 7 +++++++ ChangeLog.pre-1-6 | 7 +++++++ ChangeLog.pre-1-8 | 7 +++++++ pango/pango-attributes.c | 24 ++++++++++-------------- pango/pango-context.c | 2 -- 9 files changed, 59 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index b653aae1..8a7490a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Mar 7 09:21:14 2001 Tim Janik + + * pango/pango-attributes.c: fixed up g_boxed_type_register_static() + since GLib signature changed. + + * got rid of bogus g_type_init() calls. + 2001-02-28 Havoc Pennington * pango/pango-font.h (struct _PangoFontMetrics): add diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index b653aae1..8a7490a4 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,10 @@ +Wed Mar 7 09:21:14 2001 Tim Janik + + * pango/pango-attributes.c: fixed up g_boxed_type_register_static() + since GLib signature changed. + + * got rid of bogus g_type_init() calls. + 2001-02-28 Havoc Pennington * pango/pango-font.h (struct _PangoFontMetrics): add diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index b653aae1..8a7490a4 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,10 @@ +Wed Mar 7 09:21:14 2001 Tim Janik + + * pango/pango-attributes.c: fixed up g_boxed_type_register_static() + since GLib signature changed. + + * got rid of bogus g_type_init() calls. + 2001-02-28 Havoc Pennington * pango/pango-font.h (struct _PangoFontMetrics): add diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index b653aae1..8a7490a4 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,10 @@ +Wed Mar 7 09:21:14 2001 Tim Janik + + * pango/pango-attributes.c: fixed up g_boxed_type_register_static() + since GLib signature changed. + + * got rid of bogus g_type_init() calls. + 2001-02-28 Havoc Pennington * pango/pango-font.h (struct _PangoFontMetrics): add diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index b653aae1..8a7490a4 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,10 @@ +Wed Mar 7 09:21:14 2001 Tim Janik + + * pango/pango-attributes.c: fixed up g_boxed_type_register_static() + since GLib signature changed. + + * got rid of bogus g_type_init() calls. + 2001-02-28 Havoc Pennington * pango/pango-font.h (struct _PangoFontMetrics): add diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index b653aae1..8a7490a4 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,10 @@ +Wed Mar 7 09:21:14 2001 Tim Janik + + * pango/pango-attributes.c: fixed up g_boxed_type_register_static() + since GLib signature changed. + + * got rid of bogus g_type_init() calls. + 2001-02-28 Havoc Pennington * pango/pango-font.h (struct _PangoFontMetrics): add diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index b653aae1..8a7490a4 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,10 @@ +Wed Mar 7 09:21:14 2001 Tim Janik + + * pango/pango-attributes.c: fixed up g_boxed_type_register_static() + since GLib signature changed. + + * got rid of bogus g_type_init() calls. + 2001-02-28 Havoc Pennington * pango/pango-font.h (struct _PangoFontMetrics): add diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c index a28dd7a1..e8c7c731 100644 --- a/pango/pango-attributes.c +++ b/pango/pango-attributes.c @@ -689,13 +689,11 @@ pango_attr_list_get_type (void) static GType our_type = 0; if (our_type == 0) - { - g_type_init (0); - - our_type = g_boxed_type_register_static ("PangoAttrList", - pango_attr_list_copy, - pango_attr_list_unref); - } + our_type = g_boxed_type_register_static ("PangoAttrList", + NULL, + pango_attr_list_copy, + pango_attr_list_unref, + FALSE); return our_type; } @@ -1505,13 +1503,11 @@ pango_color_get_type (void) static GType our_type = 0; if (our_type == 0) - { - g_type_init (0); - - our_type = g_boxed_type_register_static ("PangoColor", - pango_color_copy, - pango_color_free); - } + our_type = g_boxed_type_register_static ("PangoColor", + NULL, + pango_color_copy, + pango_color_free, + FALSE); return our_type; } diff --git a/pango/pango-context.c b/pango/pango-context.c index f0c1bd9d..95a96e85 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -150,8 +150,6 @@ pango_context_new (void) { PangoContext *context; - g_type_init (0); - context = PANGO_CONTEXT (g_type_create_instance (pango_context_get_type ())); return context; -- cgit v1.2.1