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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-01-16 18:44:50 +0200 (Wed, 16 Jan 2008)
New Revision: 15083

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

Deleted: projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_070_empty_content_search_crash.diff
===================================================================
--- projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_070_empty_content_search_crash.diff	2008-01-16 14:37:50 UTC (rev 15082)
+++ projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_070_empty_content_search_crash.diff	2008-01-16 16:44:50 UTC (rev 15083)
@@ -1,58 +0,0 @@
-# Be a little more paranoid about dereferencing pointers, because they may be NULL in the
-# case of an empty document
-#
-# Copyright (C) 2006 - 2007 Nokia Corporation.
-# This file is distributed under the terms of GNU LGPL license, either version 2
-# of the License, or (at your option) any later version.
-#
-diff -ru gtkhtml-3.13.91/src/htmlengine-search.c gtkhtml-3.13.91.mod4/src/htmlengine-search.c
---- gtkhtml-3.13.91/src/htmlengine-search.c	2007-01-03 17:19:57.000000000 +0200
-+++ gtkhtml-3.13.91.mod4/src/htmlengine-search.c	2007-02-15 14:14:16.000000000 +0200
-@@ -141,6 +141,7 @@
- {
- 	HTMLSearch *info;
- 	HTMLObject *p;
-+	HTMLObject *o;
- 
- 	if (e->search_info) {
- 		html_search_destroy (e->search_info);
-@@ -148,8 +149,9 @@
- 
- 	info = e->search_info = html_search_new (e, text, case_sensitive, forward, regular);
- 
--	p = HTML_OBJECT (e->search_info->stack->data)->parent;
--	if (html_object_search (p ? p : e->clue, info)) {
-+	p = e->search_info->stack ? HTML_OBJECT (e->search_info->stack->data)->parent : NULL;
-+	o = p ? p : e->clue;
-+	if (o && html_object_search (o, info)) {
- 		display_search_results (info);
- 		return TRUE;
- 	} else
-@@ -181,7 +183,7 @@
- 			retval = html_object_search (HTML_OBJECT (info->stack->data), info);
- 		else {
- 			html_search_push (info, e->clue);
--			retval = html_object_search (e->clue, info);
-+			retval = e->clue ? html_object_search (e->clue, info) : FALSE ;
- 		}
- 		if (retval)
- 			display_search_results (info);
-diff -ru gtkhtml-3.13.91/src/htmlsearch.c gtkhtml-3.13.91.mod4/src/htmlsearch.c
---- gtkhtml-3.13.91/src/htmlsearch.c	2007-02-09 21:54:58.000000000 +0200
-+++ gtkhtml-3.13.91.mod4/src/htmlsearch.c	2007-02-15 14:14:52.000000000 +0200
-@@ -67,11 +67,13 @@
- 		for (o = e->cursor->object; o; o = o->parent)
- 			html_search_push (ns, o);
- 		ns->stack = g_slist_reverse (ns->stack);
--		ns->found = g_list_append (ns->found, e->cursor->object);
-+		if (e->cursor->object)
-+  		ns->found = g_list_append (ns->found, e->cursor->object);
- 	} else {
- 		ns->stack     = NULL;
- 		ns->start_pos = 0;
--		html_search_push (ns, e->clue);
-+		if (e->clue)
-+			html_search_push (ns, e->clue);
- 	}
- 
- 	/* translate table

Deleted: projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_080_init_offset_in_engine_focus.diff
===================================================================
--- projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_080_init_offset_in_engine_focus.diff	2008-01-16 14:37:50 UTC (rev 15082)
+++ projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_080_init_offset_in_engine_focus.diff	2008-01-16 16:44:50 UTC (rev 15083)
@@ -1,46 +0,0 @@
-# Properly initialize the variable named "offset"
-#
-# Copyright (C) 2006 - 2007 Nokia Corporation.
-# This file is distributed under the terms of GNU LGPL license, either version 2
-# of the License, or (at your option) any later version.
-#
-diff -ru gtkhtml-3.13.91/src/htmlengine.c gtkhtml-3.13.91.mod6/src/htmlengine.c
---- gtkhtml-3.13.91/src/htmlengine.c	2007-02-15 15:54:05.000000000 +0200
-+++ gtkhtml-3.13.91.mod6/src/htmlengine.c	2007-02-15 16:18:27.000000000 +0200
-@@ -6216,9 +6216,9 @@
- html_engine_focus (HTMLEngine *e, GtkDirectionType dir)
- {
- 	if (e->clue && (dir == GTK_DIR_TAB_FORWARD || dir == GTK_DIR_TAB_BACKWARD)) {
--		HTMLObject *cur;
--		HTMLObject *focus_object;
--		gint offset;
-+		HTMLObject *cur = NULL;
-+		HTMLObject *focus_object = NULL;
-+		gint offset = 0;
- 
- 		focus_object = html_engine_get_focus_object (e, &offset);
- 		if (focus_object && html_object_is_embedded (focus_object)
-@@ -6229,9 +6229,22 @@
- 		if (focus_object)
- 			cur = move_focus_object (focus_object, &offset, e, dir);
- 		else
-+		{
- 			cur = dir == GTK_DIR_TAB_FORWARD
- 				? html_object_get_head_leaf (e->clue)
- 				: html_object_get_tail_leaf (e->clue);
-+			if (HTML_IS_TEXT (cur))
-+			{
-+				if (dir == GTK_DIR_TAB_FORWARD)
-+					html_text_first_link_offset (HTML_TEXT (cur), &offset);
-+				else
-+					html_text_last_link_offset (HTML_TEXT (cur), &offset);
-+			}
-+			else
-+				offset = (dir == GTK_DIR_TAB_FORWARD)
-+					? 0
-+					: html_object_get_length (cur);
-+		}
- 
- 		while (cur) {
- 			/* printf ("try child %p\n", cur); */
-Only in gtkhtml-3.13.91.mod6/src: htmlengine.c.orig