diff options
| author | Chris Lord <chris@openedhand.com> | 2006-02-07 04:22:50 +0000 |
|---|---|---|
| committer | Chris Lord <chris@openedhand.com> | 2006-02-07 04:22:50 +0000 |
| commit | 4fbba6350edd17d9272a668b5ba564f558974a94 (patch) | |
| tree | dafc821fd7b7d4ec5e08966b6ac479f50f94e5df /openembedded/packages/gtkhtml2/files/fix-background-none.patch | |
| parent | ef60244cc4a28777efdaed9260e8c7ae4872e2b1 (diff) | |
| download | poky-4fbba6350edd17d9272a668b5ba564f558974a94.tar.gz | |
Add curl (new dependency of Web), fix a fontconfig-native build issue,
update gtkhtml2 patches and update to a newer more functional Web
snapshot
git-svn-id: https://svn.o-hand.com/repos/poky@251 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/gtkhtml2/files/fix-background-none.patch')
| -rw-r--r-- | openembedded/packages/gtkhtml2/files/fix-background-none.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/openembedded/packages/gtkhtml2/files/fix-background-none.patch b/openembedded/packages/gtkhtml2/files/fix-background-none.patch deleted file mode 100644 index 076f312009..0000000000 --- a/openembedded/packages/gtkhtml2/files/fix-background-none.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | Index: gtkhtml2/libgtkhtml/css/cssmatcher.c | ||
| 2 | =================================================================== | ||
| 3 | --- gtkhtml2.orig/libgtkhtml/css/cssmatcher.c 2006-01-21 01:02:23.000000000 +0000 | ||
| 4 | +++ gtkhtml2/libgtkhtml/css/cssmatcher.c 2006-01-25 02:07:44.000000000 +0000 | ||
| 5 | @@ -596,7 +596,13 @@ | ||
| 6 | g_object_unref (G_OBJECT(image)); | ||
| 7 | return TRUE; | ||
| 8 | } | ||
| 9 | - } | ||
| 10 | + } else if (val->value_type == CSS_IDENT && | ||
| 11 | + val->v.atom == HTML_ATOM_NONE) { | ||
| 12 | + if (style->background->image) { | ||
| 13 | + g_object_unref (style->background->image); | ||
| 14 | + style->background->image = NULL; | ||
| 15 | + } | ||
| 16 | + } | ||
| 17 | return FALSE; | ||
| 18 | } | ||
| 19 | |||
| 20 | @@ -1256,7 +1262,10 @@ | ||
| 21 | } | ||
| 22 | else if (val->value_type == CSS_FUNCTION) | ||
| 23 | handle_background_image (document, style, val); | ||
| 24 | - else if (css_parse_color (val, &color)) | ||
| 25 | + else if (val->value_type == CSS_IDENT && val->v.atom == HTML_ATOM_NONE) { | ||
| 26 | + handle_background_image (document, style, val); | ||
| 27 | + style->background->color.transparent = TRUE; | ||
| 28 | + } else if (css_parse_color (val, &color)) | ||
| 29 | html_style_set_background_color (style, &color); | ||
| 30 | |||
| 31 | break; | ||
| 32 | @@ -1273,6 +1282,8 @@ | ||
| 33 | |||
| 34 | if (val->v.atom == HTML_ATOM_INHERIT) | ||
| 35 | html_style_set_background_color (style, &parent_style->background->color); | ||
| 36 | + else if (val->v.atom == HTML_ATOM_NONE) | ||
| 37 | + style->background->color.transparent = TRUE; | ||
| 38 | else if (css_parse_color (val, &color)) | ||
| 39 | html_style_set_background_color (style, &color); | ||
| 40 | break; | ||
