rpms/gtkhtml3/devel gtkhtml-3.10.0-im-too-late.patch, NONE, 1.1 gtkhtml3.spec, 1.58, 1.59

[fedora-cvs-commits at redhat.com]

Author: dcbw

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15489

Modified Files:
	gtkhtml3.spec 
Added Files:
	gtkhtml-3.10.0-im-too-late.patch 
Log Message:
* Fri Apr  7 2006 Dan Williams <dcbw at redhat.com> - 3.10.0-2
- Fix crash with IM enabled



gtkhtml-3.10.0-im-too-late.patch:
 gtkhtml.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE gtkhtml-3.10.0-im-too-late.patch ---
--- gtkhtml-3.10.0/src/gtkhtml.c.fix	2006-04-07 08:54:58.000000000 -0700
+++ gtkhtml-3.10.0/src/gtkhtml.c	2006-04-07 08:55:54.000000000 -0700
@@ -3181,10 +3181,14 @@
 	PangoAttrList *attrs;
 	gchar *preedit_string;
 	gint cursor_pos, initial_position;
-	gboolean state = html->priv->im_block_reset;
+	gboolean state;
 	gboolean pop_selection = FALSE;
 	gint deleted = 0;
 
+	g_return_if_fail (html->priv != NULL);
+
+	state = html->priv->im_block_reset;
+
 	D_IM (printf ("IM preedit changed cb [begin] cursor %d(%p) mark %d(%p) active: %d\n",
 		      html->engine->cursor ? html->engine->cursor->position : 0, html->engine->cursor,
 		      html->engine->mark ? html->engine->mark->position : 0, html->engine->mark,


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gtkhtml3.spec	13 Mar 2006 16:54:41 -0000	1.58
+++ gtkhtml3.spec	7 Apr 2006 16:34:31 -0000	1.59
@@ -5,7 +5,7 @@
 Summary: gtkhtml library
 Name: gtkhtml3
 Version: 3.10.0
-Release: 1
+Release: 2
 License: LGPL/GPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2
@@ -27,6 +27,7 @@
 # Patches from bugzilla.ximian.com #65670, #66206
 Patch2: gtkhtml-3.3.2-imcommit.patch
 Patch3: gtkhtml-fix-indic-navigation-129212.patch
+Patch4: gtkhtml-3.10.0-im-too-late.patch
 
 %description
 GtkHTML is a lightweight HTML rendering/printing/editing engine.  It
@@ -50,6 +51,7 @@
 
 %patch1 -p1 -b .crash
 %patch3 -p1 -b .fix-129212
+%patch4 -p1 -b .im-too-late
 
 %build
 %configure
@@ -96,6 +98,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Apr  7 2006 Dan Williams <dcbw at redhat.com> - 3.10.0-2
+- Fix crash with IM enabled
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 3.10.0-1
 - Update to 3.10.0