diff options
| author | Chris Lord <chris@openedhand.com> | 2006-02-13 17:13:07 +0000 |
|---|---|---|
| committer | Chris Lord <chris@openedhand.com> | 2006-02-13 17:13:07 +0000 |
| commit | deb4dd0de43dda3840d99fcc47156658938d421f (patch) | |
| tree | 5b2f5713a806f31fc143e4fe1b1623003ff78fd3 /openembedded/packages/gtkhtml2/files/fix-margin-inherit.patch | |
| parent | aaeed35c6102608d0b11896eef2c8b428b07e2ee (diff) | |
| download | openembedded-core-deb4dd0de43dda3840d99fcc47156658938d421f.tar.gz openembedded-core-deb4dd0de43dda3840d99fcc47156658938d421f.tar.bz2 openembedded-core-deb4dd0de43dda3840d99fcc47156658938d421f.tar.xz openembedded-core-deb4dd0de43dda3840d99fcc47156658938d421f.zip | |
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.patch | 25 |
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 000000000..16337b7cc --- /dev/null +++ b/openembedded/packages/gtkhtml2/files/fix-margin-inherit.patch @@ -0,0 +1,25 @@ +Index: libgtkhtml/layout/htmlbox.c +=================================================================== +--- libgtkhtml/layout/htmlbox.c.orig 2006-02-06 01:50:52.000000000 +0000 ++++ libgtkhtml/layout/htmlbox.c 2006-02-06 01:53:16.000000000 +0000 +@@ -151,17 +151,13 @@ simple_margin (HtmlStyle *style) + static gboolean + need_containing_width (HtmlBox *box, gint width) + { +- HtmlStyle *style; +- + if (width > 0) + return FALSE; + +- style = HTML_BOX_GET_STYLE (box); +- +- if (simple_margin (style)) +- return FALSE; ++ if (html_box_get_containing_block (box)) ++ return TRUE; + +- return TRUE; ++ return FALSE; + } + + gint |