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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2007-02-14 14:33:02 +0200 (Wed, 14 Feb 2007)
New Revision: 9853

Added:
   projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_textslave_proper_disposal.diff
Modified:
   projects/haf/trunk/gtkhtml/ChangeLog
   projects/haf/trunk/gtkhtml/debian/changelog
   projects/haf/trunk/gtkhtml/debian/rules
Log:
  * Moved trunk to sardine-experimental. New patch properly frees Pango structures


Modified: projects/haf/trunk/gtkhtml/ChangeLog
===================================================================
--- projects/haf/trunk/gtkhtml/ChangeLog	2007-02-14 12:28:25 UTC (rev 9852)
+++ projects/haf/trunk/gtkhtml/ChangeLog	2007-02-14 12:33:02 UTC (rev 9853)
@@ -1,3 +1,6 @@
+2007-02-14  Gabriel Schulhof <gabriel.schulhof at nokia.com>
+	* Moved trunk to sardine-experimental. New patch properly frees Pango structures
+
 2007-02-06  Gabriel Schulhof <gabriel.schulhof at nokia.com>
 	* During button_press_event, we must record the starting (x,y) of the pan using
 	  gdk_window_get_pointer + gtk_adjustment_get_value from the two adjustments

Modified: projects/haf/trunk/gtkhtml/debian/changelog
===================================================================
--- projects/haf/trunk/gtkhtml/debian/changelog	2007-02-14 12:28:25 UTC (rev 9852)
+++ projects/haf/trunk/gtkhtml/debian/changelog	2007-02-14 12:33:02 UTC (rev 9853)
@@ -1,3 +1,9 @@
+gtkhtml (3.9.1-3osso0) unstable; urgency=low
+
+  * Moved trunk to sardine-experimental. New patch properly frees Pango structures
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Wed, 14 Feb 2007 14:29:13 +0200
+
 gtkhtml (3.9.1-2osso16) unstable; urgency=low
 
   * During button_press_event, we must record the starting (x,y) of the pan using

Modified: projects/haf/trunk/gtkhtml/debian/rules
===================================================================
--- projects/haf/trunk/gtkhtml/debian/rules	2007-02-14 12:28:25 UTC (rev 9852)
+++ projects/haf/trunk/gtkhtml/debian/rules	2007-02-14 12:33:02 UTC (rev 9853)
@@ -61,6 +61,7 @@
 	patch -p0 < upstream/patches/gtkhtml_text_selection_with_proper_doubleclick.diff
 	patch -p0 < upstream/patches/gtkhtml_dont_click_link_when_panning.diff
 	patch -p0 < upstream/patches/gtkhtml_proper_adjustment_values.diff
+	patch -p0 < upstream/patches/gtkhtml_textslave_proper_disposal.diff
 	cd $(SOURCE_DIR) && ./autogen.sh
 
 

Added: projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_textslave_proper_disposal.diff
===================================================================
--- projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_textslave_proper_disposal.diff	2007-02-14 12:28:25 UTC (rev 9852)
+++ projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_textslave_proper_disposal.diff	2007-02-14 12:33:02 UTC (rev 9853)
@@ -0,0 +1,37 @@
+diff -ru gtkhtml-3.9.1/src/htmltextslave.c gtkhtml-3.9.1.mod/src/htmltextslave.c
+--- gtkhtml-3.9.1/src/htmltextslave.c	2007-02-14 13:21:52.000000000 +0200
++++ gtkhtml-3.9.1.mod/src/htmltextslave.c	2007-02-14 13:23:29.000000000 +0200
+@@ -605,15 +605,12 @@
+ 				tmp_gi = pango_glyph_item_split (&glyph_item->glyph_item, slave->owner->text, split_index);
+ 
+ 				/* free the beginning we don't need */
+-				pango_item_free (tmp_gi->item);
+-				pango_glyph_string_free (tmp_gi->glyphs);
+-				g_free (tmp_gi);
+-				
++				pango_glyph_item_free (tmp_gi) ;
+ 			}
+ 
+ 			if (offset + item->num_chars > end_offset) {
+ 				/* need to cut the ending of current glyph item */
+-				PangoGlyphItem tmp_gi1, *tmp_gi2;
++				PangoGlyphItem tmp_gi1, *tmp_gi2 = NULL;
+ 				int split_index;
+ 
+ 				if (glyph_item->type == HTML_TEXT_SLAVE_GLYPH_ITEM_PARENTAL) {
+@@ -626,12 +623,13 @@
+ 					- (slave->owner->text + tmp_gi1.item->offset);
+ 				tmp_gi2 = pango_glyph_item_split (&tmp_gi1, slave->owner->text, split_index);
+ 
+-				glyph_item->glyph_item = *tmp_gi2;
++				glyph_item->glyph_item.item   = pango_item_copy (tmp_gi2->item);
++				glyph_item->glyph_item.glyphs = pango_glyph_string_copy (tmp_gi2->glyphs) ;
+ 
+ 				/* free the tmp1 content and tmp2 container, but not the content */
+ 				pango_item_free (tmp_gi1.item);
+ 				pango_glyph_string_free (tmp_gi1.glyphs);
+-				g_free (tmp_gi2);
++				pango_glyph_item_free (tmp_gi2);
+ 
+ 				glyph_item->type = HTML_TEXT_SLAVE_GLYPH_ITEM_CREATED;
+ 				glyph_item->widths = NULL;