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

[From: www-data at stage.maemo.org]

Author: pavelek
Date: 2006-11-27 14:35:56 +0200 (Mon, 27 Nov 2006)
New Revision: 8341

Added:
   projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_unrealize_fix.diff
Modified:
   projects/haf/trunk/gtkhtml/ChangeLog
   projects/haf/trunk/gtkhtml/debian/changelog
   projects/haf/trunk/gtkhtml/debian/rules
Log:
        * added gtkhtml_unrealize_fix.diff to get rid of glib critical

New debian version, not releasing yet.



Modified: projects/haf/trunk/gtkhtml/ChangeLog
===================================================================
--- projects/haf/trunk/gtkhtml/ChangeLog	2006-11-27 12:31:16 UTC (rev 8340)
+++ projects/haf/trunk/gtkhtml/ChangeLog	2006-11-27 12:35:56 UTC (rev 8341)
@@ -1,3 +1,7 @@
+2006-11-27  Jakub Pavelek <jakub.pavelek at nokia.com>
+
+	* added gtkhtml_unrealize_fix.diff to get rid of glib critical
+
 2006-11-20  Jakub Pavelek <jakub.pavelek at nokia.com>
 
 	* 3.9.1-2osso10

Modified: projects/haf/trunk/gtkhtml/debian/changelog
===================================================================
--- projects/haf/trunk/gtkhtml/debian/changelog	2006-11-27 12:31:16 UTC (rev 8340)
+++ projects/haf/trunk/gtkhtml/debian/changelog	2006-11-27 12:35:56 UTC (rev 8341)
@@ -1,3 +1,10 @@
+gtkhtml (3.9.1-2osso11) unstable; urgency=low
+
+  * Unrealize fix - added gtkhtml_unrealize_fix.diff
+  * Fixes: NB#46236
+
+ -- Jakub Pavelek <jakub.pavelek at nokia.com>  Mon, 27 Nov 2006 12:30:44 +0200
+
 gtkhtml (3.9.1-2osso10) unstable; urgency=low
 
   * Updated the IM leak patch to protect from recurrent freeing

Modified: projects/haf/trunk/gtkhtml/debian/rules
===================================================================
--- projects/haf/trunk/gtkhtml/debian/rules	2006-11-27 12:31:16 UTC (rev 8340)
+++ projects/haf/trunk/gtkhtml/debian/rules	2006-11-27 12:35:56 UTC (rev 8341)
@@ -57,6 +57,7 @@
 	patch -p0 < upstream/patches/gtkhtml_empty_content_search_crash.diff
 	patch -p0 < upstream/patches/gtkhtml_imcontext_leak.diff
 	patch -p0 < upstream/patches/gtkhtml_const_patch.diff
+	patch -p0 < upstream/patches/gtkhtml_unrealize_fix.diff
 	cd $(SOURCE_DIR) && ./autogen.sh
 
 

Added: projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_unrealize_fix.diff
===================================================================
--- projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_unrealize_fix.diff	2006-11-27 12:31:16 UTC (rev 8340)
+++ projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_unrealize_fix.diff	2006-11-27 12:35:56 UTC (rev 8341)
@@ -0,0 +1,12 @@
+diff -ru gtkhtml-3.9.1/src/gtkhtml.c gtkhtml-3.9.1-unref-fix/src/gtkhtml.c
+--- gtkhtml-3.9.1/src/gtkhtml.c	2006-11-22 19:57:01.000000000 +0200
++++ gtkhtml-3.9.1-unref-fix/src/gtkhtml.c	2006-11-22 19:59:42.000000000 +0200
+@@ -1062,7 +1062,7 @@
+ 
+ 	html_engine_unrealize (html->engine);
+ 
+-	gtk_im_context_set_client_window (html->priv->im_context, widget->window);
++	gtk_im_context_set_client_window (html->priv->im_context, NULL);
+ 
+ 	html_image_factory_stop_animations (html->engine->image_factory);
+