[maemo-commits] [maemo-commits] r15077 - in projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port: . debian patches

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-01-16 15:31:40 +0200 (Wed, 16 Jan 2008)
New Revision: 15077

Added:
   projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/
Removed:
   projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_010_imcontext_leak_fix.diff
Modified:
   projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/debian/rules
Log:
gtkhtml_010_imcontext_leak_fix.diff is already present

Modified: projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/debian/rules
===================================================================
--- projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/debian/rules	2008-01-16 13:24:47 UTC (rev 15076)
+++ projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/debian/rules	2008-01-16 13:31:40 UTC (rev 15077)
@@ -39,10 +39,10 @@
 
 $(SOURCE_DIR)/configure:
 	#inflate upstream and prepare
-	tar -jxf upstream/tarballs/gtkhtml-3.13.91.tar.bz2
+	tar -jxf upstream/gtkhtml-3.17.5.tar.bz2
 	#patches must be properly numbered for this to work
 	#i.e., gtkhtml_[0-9][0-9][0-9]_<description>.diff
-	for patch in upstream/patches/gtkhtml_[0-9][0-9][0-9]_*.diff; do \
+	for patch in patches/gtkhtml_[0-9][0-9][0-9]_*.diff; do \
 		echo -e '\033[7m'Applying $$patch ...'\033[0m'; \
 		patch -p0 < $$patch || exit 1; \
 	done

Copied: projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches (from rev 15073, projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/upstream/patches)

Deleted: projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_010_imcontext_leak_fix.diff
===================================================================
--- projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/upstream/patches/gtkhtml_010_imcontext_leak_fix.diff	2008-01-16 12:36:39 UTC (rev 15073)
+++ projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_010_imcontext_leak_fix.diff	2008-01-16 13:31:40 UTC (rev 15077)
@@ -1,21 +0,0 @@
-# Free IMContext during destruction
-#
-# Copyright (C) 2006 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/gtkhtml.c gtkhtml-3.13.91.mod5/src/gtkhtml.c
---- gtkhtml-3.13.91/src/gtkhtml.c	2007-02-15 12:59:30.000000000 +0200
-+++ gtkhtml-3.13.91.mod5/src/gtkhtml.c	2007-02-15 14:40:31.000000000 +0200
-@@ -754,6 +754,11 @@
- 			html->priv->resize_cursor = NULL;
- 		}
- 
-+		if (html->priv->im_context) {
-+			g_object_unref (html->priv->im_context);
-+			html->priv->im_context = NULL;
-+		}
-+
- 		g_free (html->priv->content_type);
- 		g_free (html->priv->base_url);
- 		g_free (html->priv);