summaryrefslogtreecommitdiffstats
path: root/openembedded/packages/gtkhtml2/files/fix-margin-inherit.patch
diff options
context:
space:
mode:
authorChris Lord <chris@openedhand.com>2006-02-13 17:13:07 +0000
committerChris Lord <chris@openedhand.com>2006-02-13 17:13:07 +0000
commitdeb4dd0de43dda3840d99fcc47156658938d421f (patch)
tree5b2f5713a806f31fc143e4fe1b1623003ff78fd3 /openembedded/packages/gtkhtml2/files/fix-margin-inherit.patch
parentaaeed35c6102608d0b11896eef2c8b428b07e2ee (diff)
downloadpoky-deb4dd0de43dda3840d99fcc47156658938d421f.tar.gz
Fix libcurl RPROVIDES, update gtkhtml2 patches and add web to oh-image
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@277 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/gtkhtml2/files/fix-margin-inherit.patch')
-rw-r--r--openembedded/packages/gtkhtml2/files/fix-margin-inherit.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/openembedded/packages/gtkhtml2/files/fix-margin-inherit.patch b/openembedded/packages/gtkhtml2/files/fix-margin-inherit.patch
new file mode 100644
index 0000000000..16337b7cc1
--- /dev/null
+++ b/openembedded/packages/gtkhtml2/files/fix-margin-inherit.patch
@@ -0,0 +1,25 @@
1Index: libgtkhtml/layout/htmlbox.c
2===================================================================
3--- libgtkhtml/layout/htmlbox.c.orig 2006-02-06 01:50:52.000000000 +0000
4+++ libgtkhtml/layout/htmlbox.c 2006-02-06 01:53:16.000000000 +0000
5@@ -151,17 +151,13 @@ simple_margin (HtmlStyle *style)
6 static gboolean
7 need_containing_width (HtmlBox *box, gint width)
8 {
9- HtmlStyle *style;
10-
11 if (width > 0)
12 return FALSE;
13
14- style = HTML_BOX_GET_STYLE (box);
15-
16- if (simple_margin (style))
17- return FALSE;
18+ if (html_box_get_containing_block (box))
19+ return TRUE;
20
21- return TRUE;
22+ return FALSE;
23 }
24
25 gint