[maemo-commits] [maemo-commits] r15084 - projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-01-17 11:28:51 +0200 (Thu, 17 Jan 2008)
New Revision: 15084

Removed:
   projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_260_utf8_text_search_backport.diff
Log:
gtkhtml_260_utf8_text_search_backport.diff is already present

Deleted: projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_260_utf8_text_search_backport.diff
===================================================================
--- projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_260_utf8_text_search_backport.diff	2008-01-16 16:44:50 UTC (rev 15083)
+++ projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_260_utf8_text_search_backport.diff	2008-01-17 09:28:51 UTC (rev 15084)
@@ -1,38 +0,0 @@
-diff -ru gtkhtml-3.13.91/src/htmlclueflow.c gtkhtml-3.13.91-utf8-text-search-backport/src/htmlclueflow.c
---- gtkhtml-3.13.91/src/htmlclueflow.c	2007-02-09 21:54:58.000000000 +0200
-+++ gtkhtml-3.13.91-utf8-text-search-backport/src/htmlclueflow.c	2007-11-08 14:17:16.000000000 +0200
-@@ -2342,16 +2342,25 @@
- 				/* substring search - simple one - could be improved
- 				   go thru par and look for info->text */
- 				while (par [index]) {
--					if (info->trans [(guchar) info->text
--							[(info->forward) ? eq_bytes : info->text_bytes - eq_bytes - 1]]
--					    == info->trans [par [index]]) {
--						eq_bytes ++;
-+					gunichar unicode_info, unicode_par;
-+
-+					unicode_info = g_utf8_get_char (((info->forward)
-+									? (info->text + eq_bytes)
-+									: g_utf8_prev_char (info->text + info->text_bytes - eq_bytes)));
-+					unicode_par = g_utf8_get_char ((gchar *) par + index);
-+					if (!info->case_sensitive) {
-+                                             unicode_info = g_unichar_toupper (unicode_info);
-+				 	     unicode_par  = g_unichar_toupper (unicode_par);
-+					}
-+
-+               				if (unicode_info == unicode_par) {
-+						eq_bytes += (guchar *)g_utf8_next_char (par + index) - par - index;
-+
- 						if (eq_bytes == info->text_bytes) {
--							search_set_info (head, info, par,
--									 index - (info->forward
--										  ? -(((guchar *) g_utf8_next_char (par + index - eq_bytes)) - par - index)
--										  : 0),
--									 info->text_bytes);
-+							/* The above par + index is always at the beginning of the last character matched */
-+							if (info->forward)
-+								index = (guchar *) g_utf8_next_char ((gchar *) par + index) - par - eq_bytes;
-+							search_set_info (head, info, par, index, info->text_bytes);
- 							retval=TRUE;
- 							break;
- 						}