Date: Tuesday, June 19, 2012 @ 15:27:55 Author: heftig Revision: 162092
4.4.3 Modified: gtkhtml4/trunk/PKGBUILD Deleted: gtkhtml4/trunk/fix-selection-behaviour-in-iframe.patch -----------------------------------------+ PKGBUILD | 4 +-- fix-selection-behaviour-in-iframe.patch | 35 ------------------------------ 2 files changed, 2 insertions(+), 37 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-06-19 18:25:25 UTC (rev 162091) +++ PKGBUILD 2012-06-19 19:27:55 UTC (rev 162092) @@ -3,7 +3,7 @@ pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.4.2 +pkgver=4.4.3 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64) @@ -13,7 +13,7 @@ url="http://www.gnome.org" options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('96b0d561a697c0b85dbe0e6a0d220012765a3aa4f2a9e8ffddd520891094e694') +sha256sums=('da1f593dafcb202dbed0e99bc14ef20bfd5c54ec0d966912feeb7ba7864418aa') build() { cd "$_pkgbasename-$pkgver" Deleted: fix-selection-behaviour-in-iframe.patch =================================================================== --- fix-selection-behaviour-in-iframe.patch 2012-06-19 18:25:25 UTC (rev 162091) +++ fix-selection-behaviour-in-iframe.patch 2012-06-19 19:27:55 UTC (rev 162092) @@ -1,35 +0,0 @@ -From 9ec36544203d4c1b98aa843c2c3ff0a4f725da68 Mon Sep 17 00:00:00 2001 -From: Sam Thursfield <sam.thursfi...@codethink.co.uk> -Date: Thu, 03 May 2012 19:04:20 +0000 -Subject: Bug 672582 - Fix selection behavior inside <iframe> - -Since kinetic scrolling was introduced in Gtk+, GtkScrolledWindow -has had its own GdkWindow. This means we need to use the allocation -of the GtkScrolledWindow rather than its child GtkHTML widget when we -want to translate pointer coordinates relative to the iframe, because -a widget's GtkAllocation is relative to the parent GdkWindow. - -(cherry picked from commit 7b7b37745d2f46914be314e4d7aef7a575529345) ---- -diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c -index 697b16e..6284855 100644 ---- a/gtkhtml/gtkhtml.c -+++ b/gtkhtml/gtkhtml.c -@@ -1823,9 +1823,14 @@ shift_to_iframe_parent (GtkWidget *widget, - 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; --- -cgit v0.9.0.2