diff options
| author | Chris Lord <chris@openedhand.com> | 2006-03-24 14:29:37 +0000 |
|---|---|---|
| committer | Chris Lord <chris@openedhand.com> | 2006-03-24 14:29:37 +0000 |
| commit | 15484b8c50f836a51484e1228e509ff03f39d935 (patch) | |
| tree | 7d0396125e53a5f08d810547bc0223320451b893 /openembedded/packages/gtkhtml2/files/fix-style-change.patch | |
| parent | d614461fe9aa3480bc7c4bcd8abe704522979f2c (diff) | |
| download | poky-15484b8c50f836a51484e1228e509ff03f39d935.tar.gz | |
Update gtkhtml2 and Web packages
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@338 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/gtkhtml2/files/fix-style-change.patch')
| -rw-r--r-- | openembedded/packages/gtkhtml2/files/fix-style-change.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/openembedded/packages/gtkhtml2/files/fix-style-change.patch b/openembedded/packages/gtkhtml2/files/fix-style-change.patch deleted file mode 100644 index 865f2692a8..0000000000 --- a/openembedded/packages/gtkhtml2/files/fix-style-change.patch +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | Index: libgtkhtml/view/htmlview.c | ||
| 2 | =================================================================== | ||
| 3 | --- libgtkhtml/view/htmlview.c.orig 2006-02-11 04:45:41.000000000 +0000 | ||
| 4 | +++ libgtkhtml/view/htmlview.c 2006-02-11 04:45:42.000000000 +0000 | ||
| 5 | @@ -2286,9 +2286,7 @@ html_view_realize (GtkWidget *widget) | ||
| 6 | * GtkLayout uses the bg color for background but we want | ||
| 7 | * to use base color. | ||
| 8 | */ | ||
| 9 | - widget->style = gtk_style_copy (widget->style); | ||
| 10 | - widget->style->bg[GTK_STATE_NORMAL] = | ||
| 11 | - widget->style->base[GTK_STATE_NORMAL]; | ||
| 12 | + gtk_widget_modify_bg (widget, GTK_STATE_NORMAL, &widget->style->base[GTK_STATE_NORMAL]); | ||
| 13 | /* | ||
| 14 | * Store the font size so we can adjust size of HtmlFontSpecification | ||
| 15 | * if the size changes. | ||
| 16 | @@ -3189,9 +3187,10 @@ html_view_style_set (GtkWidget *widget, | ||
| 17 | "focus-line-width", &focus_width, | ||
| 18 | NULL); | ||
| 19 | |||
| 20 | - | ||
| 21 | - widget->style->bg[GTK_STATE_NORMAL] = | ||
| 22 | - widget->style->base[GTK_STATE_NORMAL]; | ||
| 23 | + if (!gdk_color_equal (&widget->style->bg[GTK_STATE_NORMAL], &widget->style->base[GTK_STATE_NORMAL])) { | ||
| 24 | + gtk_widget_modify_bg (widget, GTK_STATE_NORMAL, &widget->style->base[GTK_STATE_NORMAL]); | ||
| 25 | + return; | ||
| 26 | + } | ||
| 27 | fsize = pango_font_description_get_size (widget->style->font_desc) / (gfloat) PANGO_SCALE; | ||
| 28 | new_isize = (gint) fsize; | ||
| 29 | old_isize = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "html-view-font-size")); | ||
