[gtkhtml3/f17] Fix selection in <iframe>

[Matthew Barnes]

commit a125b8f772bcc049d4abdfa0db07494f73dd149e
Author: Matthew Barnes <mbarnes at redhat.com>
Date:   Thu May 3 15:14:02 2012 -0400

    Fix selection in <iframe>

 gtkhtml-4.4.1-fix-iframe-selection.patch |   19 +++++++++++++++++++
 gtkhtml3.spec                            |   10 +++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)
---
diff --git a/gtkhtml-4.4.1-fix-iframe-selection.patch b/gtkhtml-4.4.1-fix-iframe-selection.patch
new file mode 100644
index 0000000..eeda23f
--- /dev/null
+++ b/gtkhtml-4.4.1-fix-iframe-selection.patch
@@ -0,0 +1,19 @@
+diff -up gtkhtml-4.4.1/gtkhtml/gtkhtml.c.fix-iframe-selection gtkhtml-4.4.1/gtkhtml/gtkhtml.c
+--- gtkhtml-4.4.1/gtkhtml/gtkhtml.c.fix-iframe-selection	2012-01-31 07:44:07.000000000 -0500
++++ gtkhtml-4.4.1/gtkhtml/gtkhtml.c	2012-05-03 15:11:23.029514524 -0400
+@@ -1823,9 +1823,14 @@ shift_to_iframe_parent (GtkWidget *widge
+                         gint *y)
+ {
+ 	while (GTK_HTML (widget)->iframe_parent) {
++		GtkWidget *scrolled_window;
+ 		GtkAllocation allocation;
+ 
+-		gtk_widget_get_allocation (widget, &allocation);
++		scrolled_window = gtk_widget_get_parent (widget);
++
++		g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), widget);
++
++		gtk_widget_get_allocation (scrolled_window, &allocation);
+ 
+ 		if (x)
+ 			*x += allocation.x - GTK_HTML (widget)->engine->x_offset;
diff --git a/gtkhtml3.spec b/gtkhtml3.spec
index 8df9cd1..38f9791 100644
--- a/gtkhtml3.spec
+++ b/gtkhtml3.spec
@@ -5,7 +5,7 @@
 
 Name: gtkhtml3
 Version: 4.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 Summary: GtkHTML library
 License: LGPLv2+ and GPLv2
@@ -14,7 +14,8 @@ Source: http://download.gnome.org/sources/gtkhtml/4.4/gtkhtml-%{version}.tar.xz
 
 ### Patches ###
 
-#Patch01: gtkhtml-4.3.1-no-g-thread-init.patch
+# GNOME bug #672582
+Patch01: gtkhtml-4.4.1-fix-iframe-selection.patch
 
 ### Build Dependencies ###
 
@@ -45,7 +46,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n gtkhtml-%{version}
-#%patch01 -p1 -b .no-g-thread-init
+%patch01 -p1 -b .fix-iframe-selection
 
 %build
 autoreconf -fi
@@ -78,6 +79,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu May 03 2012 Matthew Barnes <mbarnes at redhat.com> - 4.4.1-2
+- Add patch for GNOME bug #672582 (fix selection in <iframe>).
+
 * Mon Apr 16 2012 Milan Crha <mcrha at redhat.com> - 4.4.1-1
 - Update to 4.4.1