rpms/gtkhtml3/devel gtkhtml-3.11.92-chain-finalize.patch, NONE, 1.1 gtkhtml3.spec, 1.70, 1.71
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Aug 29 18:33:42 UTC 2006
Author: mbarnes
Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17489
Modified Files:
gtkhtml3.spec
Added Files:
gtkhtml-3.11.92-chain-finalize.patch
Log Message:
* Tue Aug 29 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.92-2.fc6
- Add patch for Gnome.org bug #353424.
gtkhtml-3.11.92-chain-finalize.patch:
a11y/cell.c | 7 -------
a11y/html.c | 8 --------
a11y/image.c | 7 -------
a11y/object.c | 8 --------
a11y/object.h | 2 --
a11y/paragraph.c | 7 -------
a11y/table.c | 7 -------
a11y/text.c | 8 ++++++++
src/htmltokenizer.c | 2 ++
9 files changed, 10 insertions(+), 46 deletions(-)
--- NEW FILE gtkhtml-3.11.92-chain-finalize.patch ---
--- gtkhtml-3.11.92/a11y/table.c.chain-finalize 2004-12-29 06:23:53.000000000 -0500
+++ gtkhtml-3.11.92/a11y/table.c 2006-08-29 12:22:01.000000000 -0400
@@ -102,11 +102,6 @@
}
static void
-html_a11y_table_finalize (GObject *obj)
-{
-}
-
-static void
html_a11y_table_initialize (AtkObject *obj, gpointer data)
{
/* printf ("html_a11y_table_initialize\n"); */
@@ -118,13 +113,11 @@
static void
html_a11y_table_class_init (HTMLA11YTableClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
atk_class->initialize = html_a11y_table_initialize;
- gobject_class->finalize = html_a11y_table_finalize;
}
static void
--- gtkhtml-3.11.92/a11y/cell.c.chain-finalize 2002-11-01 10:34:27.000000000 -0500
+++ gtkhtml-3.11.92/a11y/cell.c 2006-08-29 12:22:01.000000000 -0400
@@ -60,11 +60,6 @@
}
static void
-html_a11y_cell_finalize (GObject *obj)
-{
-}
-
-static void
html_a11y_cell_initialize (AtkObject *obj, gpointer data)
{
/* printf ("html_a11y_cell_initialize\n"); */
@@ -76,13 +71,11 @@
static void
html_a11y_cell_class_init (HTMLA11YCellClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
atk_class->initialize = html_a11y_cell_initialize;
- gobject_class->finalize = html_a11y_cell_finalize;
}
static void
--- gtkhtml-3.11.92/a11y/paragraph.c.chain-finalize 2002-11-01 10:34:27.000000000 -0500
+++ gtkhtml-3.11.92/a11y/paragraph.c 2006-08-29 12:22:01.000000000 -0400
@@ -55,11 +55,6 @@
}
static void
-html_a11y_paragraph_finalize (GObject *obj)
-{
-}
-
-static void
html_a11y_paragraph_initialize (AtkObject *obj, gpointer data)
{
/* printf ("html_a11y_paragraph_initialize\n"); */
@@ -71,13 +66,11 @@
static void
html_a11y_paragraph_class_init (HTMLA11YParagraphClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
atk_class->initialize = html_a11y_paragraph_initialize;
- gobject_class->finalize = html_a11y_paragraph_finalize;
}
static void
--- gtkhtml-3.11.92/a11y/object.h.chain-finalize 2002-11-01 10:34:27.000000000 -0500
+++ gtkhtml-3.11.92/a11y/object.h 2006-08-29 12:34:24.000000000 -0400
@@ -43,8 +43,6 @@
struct _GtkHTMLA11Y
{
GtkAccessible parent;
-
- AtkObject *tree;
};
GType gtk_html_a11y_get_type (void);
--- gtkhtml-3.11.92/a11y/object.c.chain-finalize 2006-05-09 04:54:05.000000000 -0400
+++ gtkhtml-3.11.92/a11y/object.c 2006-08-29 12:22:01.000000000 -0400
@@ -153,11 +153,6 @@
}
static void
-gtk_html_a11y_finalize (GObject *obj)
-{
-}
-
-static void
gtk_html_a11y_initialize (AtkObject *obj, gpointer data)
{
/* printf ("gtk_html_a11y_initialize\n"); */
@@ -261,7 +256,6 @@
static void
gtk_html_a11y_class_init (GtkHTMLA11YClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
@@ -270,8 +264,6 @@
atk_class->get_n_children = gtk_html_a11y_get_n_children;
atk_class->ref_child = gtk_html_a11y_ref_child;
atk_class->get_name = gtk_html_a11y_get_name;
-
- gobject_class->finalize = gtk_html_a11y_finalize;
}
static void
--- gtkhtml-3.11.92/a11y/text.c.chain-finalize 2006-06-14 00:56:08.000000000 -0400
+++ gtkhtml-3.11.92/a11y/text.c 2006-08-29 12:22:01.000000000 -0400
@@ -249,6 +249,14 @@
static void
html_a11y_text_finalize (GObject *obj)
{
+ HTMLA11YText *ato = HTML_A11Y_TEXT (obj);
+
+ if (ato->util != NULL) {
+ g_object_unref (ato->util);
+ ato->util = NULL;
+ }
+
+ G_OBJECT_CLASS (parent_class)->finalize (obj);
}
static void
--- gtkhtml-3.11.92/a11y/html.c.chain-finalize 2006-02-28 14:49:22.000000000 -0500
+++ gtkhtml-3.11.92/a11y/html.c 2006-08-29 12:22:01.000000000 -0400
@@ -98,11 +98,6 @@
}
static void
-html_a11y_finalize (GObject *obj)
-{
-}
-
-static void
html_a11y_initialize (AtkObject *obj, gpointer data)
{
/* printf ("html_a11y_initialize\n"); */
@@ -116,7 +111,6 @@
static void
html_a11y_class_init (HTMLA11YClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
@@ -127,8 +121,6 @@
atk_class->ref_state_set = html_a11y_ref_state_set;
atk_class->get_n_children = html_a11y_get_n_children;
atk_class->ref_child = html_a11y_ref_child;
-
- gobject_class->finalize = html_a11y_finalize;
}
static void
--- gtkhtml-3.11.92/a11y/image.c.chain-finalize 2005-05-17 10:47:56.000000000 -0400
+++ gtkhtml-3.11.92/a11y/image.c 2006-08-29 12:22:01.000000000 -0400
@@ -86,11 +86,6 @@
}
static void
-html_a11y_image_finalize (GObject *obj)
-{
-}
-
-static void
html_a11y_image_initialize (AtkObject *obj, gpointer data)
{
/* printf ("html_a11y_image_initialize\n"); */
@@ -102,14 +97,12 @@
static void
html_a11y_image_class_init (HTMLA11YImageClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
atk_class->get_name = html_a11y_image_get_name;
atk_class->initialize = html_a11y_image_initialize;
- gobject_class->finalize = html_a11y_image_finalize;
}
static void
--- gtkhtml-3.11.92/src/htmltokenizer.c.chain-finalize 2004-05-13 11:07:33.000000000 -0400
+++ gtkhtml-3.11.92/src/htmltokenizer.c 2006-08-29 12:22:01.000000000 -0400
@@ -259,6 +259,8 @@
g_free (t->priv);
t->priv = NULL;
+
+ G_OBJECT_CLASS (parent_class)->finalize (obj);
}
GtkType
Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- gtkhtml3.spec 21 Aug 2006 14:20:44 -0000 1.70
+++ gtkhtml3.spec 29 Aug 2006 18:33:36 -0000 1.71
@@ -6,7 +6,7 @@
Name: gtkhtml3
Version: 3.11.92
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPL/GPL
Group: System Environment/Libraries
Summary: gtkhtml library
@@ -26,6 +26,9 @@
# RH bug #202409
Patch5: gtkhtml-3.11.91-fix-undefined-symbol.patch
+# Gnome.org bug #353424.
+Patch6: gtkhtml-3.11.92-chain-finalize.patch
+
### Dependencies ###
Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -66,6 +69,7 @@
%patch3 -p1 -b .fix-129212
%patch4 -p1 -b .im-too-late
%patch5 -p1 -b .fix-undefined-symbol
+%patch6 -p1 -b .chain-finalize
%build
%configure
@@ -112,6 +116,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Tue Aug 29 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.92-2.fc6
+- Add patch for Gnome.org bug #353424.
+
* Mon Aug 21 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.92-1.fc6
- Update to 3.11.92
More information about the fedora-cvs-commits
mailing list