[maemo-commits] [maemo-commits] r9217 - in projects/haf/trunk/gtkhtml: . debian upstream/patches

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2007-01-22 13:04:00 +0200 (Mon, 22 Jan 2007)
New Revision: 9217

Added:
   projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_text_selection_with_proper_doubleclick.diff
Modified:
   projects/haf/trunk/gtkhtml/ChangeLog
   projects/haf/trunk/gtkhtml/debian/changelog
   projects/haf/trunk/gtkhtml/debian/rules
Log:
Determine double-click distance tolerance via GtkSettings, not hardcoded value
Fixes: NB#50744



Modified: projects/haf/trunk/gtkhtml/ChangeLog
===================================================================
--- projects/haf/trunk/gtkhtml/ChangeLog	2007-01-22 10:57:12 UTC (rev 9216)
+++ projects/haf/trunk/gtkhtml/ChangeLog	2007-01-22 11:04:00 UTC (rev 9217)
@@ -1,3 +1,8 @@
+2007-01-22  Gabriel Schulhof <gabriel.schulhof at nokia.com>
+
+	* Determine double-click distance tolerance via GtkSettings, not hardcoded value
+	* Fixes: NB#50744
+
 2006-12-05  Gabriel Schulhof <gabriel.schulho at nokia.com>
 
 	* htmlengine.c:insert_text: Improved space-eating algorithm

Modified: projects/haf/trunk/gtkhtml/debian/changelog
===================================================================
--- projects/haf/trunk/gtkhtml/debian/changelog	2007-01-22 10:57:12 UTC (rev 9216)
+++ projects/haf/trunk/gtkhtml/debian/changelog	2007-01-22 11:04:00 UTC (rev 9217)
@@ -1,3 +1,10 @@
+gtkhtml (3.9.1-2osso14) unstable; urgency=low
+
+  * Determine double-click distance tolerance via GtkSettings, not hardcoded value
+  * Fixes: NB#50744
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Mon, 22 Jan 2007 12:59:43 +0200
+
 gtkhtml (3.9.1-2osso13) unstable; urgency=low
 
   * htmlengine.c:insert_text: Improved space-eating algorithm

Modified: projects/haf/trunk/gtkhtml/debian/rules
===================================================================
--- projects/haf/trunk/gtkhtml/debian/rules	2007-01-22 10:57:12 UTC (rev 9216)
+++ projects/haf/trunk/gtkhtml/debian/rules	2007-01-22 11:04:00 UTC (rev 9217)
@@ -38,11 +38,8 @@
 	cd $(SOURCE_DIR) && CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
 $(SOURCE_DIR)/configure:
-	#inflat upstream and prepare
+	#inflate upstream and prepare
 	tar -jxf upstream/tarballs/gtkhtml-3.9.1osso.tar.bz2
-#	for f in upstream/patches/*.diff; do \
-#		patch -p0 < $$f; \
-#	done
 	patch -p0 < upstream/patches/gtkhtml_dependency_removal.diff
 	patch -p0 < upstream/patches/gtkhtml_dependency_removal_cleaning.diff
 	patch -p0 < upstream/patches/gtkhtml_panning.diff
@@ -61,6 +58,7 @@
 	patch -p0 < upstream/patches/gtkhtml_image_magnification.diff
 	patch -p0 < upstream/patches/gtkhtml_get_motion_hints.diff
 	patch -p0 < upstream/patches/gtkhtml_better_spacing.diff
+	patch -p0 < upstream/patches/gtkhtml_text_selection_with_proper_doubleclick.diff
 	cd $(SOURCE_DIR) && ./autogen.sh
 
 

Added: projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_text_selection_with_proper_doubleclick.diff
===================================================================
--- projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_text_selection_with_proper_doubleclick.diff	2007-01-22 10:57:12 UTC (rev 9216)
+++ projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_text_selection_with_proper_doubleclick.diff	2007-01-22 11:04:00 UTC (rev 9217)
@@ -0,0 +1,26 @@
+diff -ru gtkhtml-3.9.1/src/gtkhtml.c gtkhtml-3.9.1.new/src/gtkhtml.c
+--- gtkhtml-3.9.1/src/gtkhtml.c	2007-01-22 10:35:40.000000000 +0200
++++ gtkhtml-3.9.1.new/src/gtkhtml.c	2007-01-22 10:52:26.000000000 +0200
+@@ -1598,6 +1598,11 @@
+ 	GdkWindow *window = widget->window;
+ 	HTMLEngine *engine;
+ 	gint x, y;
++	guint mouse_double_click_threshold = MOUSE_DBLCLK_THRESHOLD ;
++	GtkSettings *gtk_settings = gtk_widget_get_settings (widget) ;
++
++	if (NULL != gtk_settings)
++		g_object_get (G_OBJECT (gtk_settings), "gtk-double-click-distance", &mouse_double_click_threshold, NULL) ;
+ 
+ 	g_return_val_if_fail (widget != NULL, 0);
+ 	g_return_val_if_fail (GTK_IS_HTML (widget), 0);
+@@ -1619,8 +1624,8 @@
+ 	if (GTK_HTML (widget)->simple_dblclick) {
+ 	    GtkHTML *html = GTK_HTML (widget);
+ 	    
+-	    if (abs(x - html->selection_x1) <= MOUSE_DBLCLK_THRESHOLD && 
+-		abs(y - html->selection_y1) <= MOUSE_DBLCLK_THRESHOLD)
++	    if (abs(x - html->selection_x1) <= mouse_double_click_threshold && 
++		abs(y - html->selection_y1) <= mouse_double_click_threshold)
+ 		return TRUE;
+ 		
+ 	    html->simple_dblclick = FALSE;