diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /gtkhtml | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'gtkhtml')
| -rw-r--r-- | gtkhtml/gtkhtml-3.0/fix-missing-colormap.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/gtkhtml/gtkhtml-3.0/fix-missing-colormap.patch b/gtkhtml/gtkhtml-3.0/fix-missing-colormap.patch index e69de29bb2..6ec7409bd4 100644 --- a/gtkhtml/gtkhtml-3.0/fix-missing-colormap.patch +++ b/gtkhtml/gtkhtml-3.0/fix-missing-colormap.patch @@ -0,0 +1,36 @@ +--- gtkhtml-3.0.10/src/htmlgdkpainter.c.orig 2004-07-23 17:07:05.000000000 +0100 ++++ gtkhtml-3.0.10/src/htmlgdkpainter.c 2004-07-23 17:17:09.000000000 +0100 +@@ -277,22 +277,19 @@ + begin (HTMLPainter *painter, int x1, int y1, int x2, int y2) + { + HTMLGdkPainter *gdk_painter; +- GdkVisual *visual; + + /* printf ("painter begin %d,%d %d,%d\n", x1, y1, x2, y2); */ + + gdk_painter = HTML_GDK_PAINTER (painter); + g_return_if_fail (gdk_painter->window != NULL); +- visual = gdk_drawable_get_visual (gdk_painter->window); +- g_return_if_fail (visual != NULL); + + if (gdk_painter->double_buffer){ + const int width = x2 - x1 + 1; + const int height = y2 - y1 + 1; + + g_assert (gdk_painter->pixmap == NULL); +- +- gdk_painter->pixmap = gdk_pixmap_new (gdk_painter->pixmap, width, height, visual->depth); ++ ++ gdk_painter->pixmap = gdk_pixmap_new (gdk_painter->window, width, height, -1); + gdk_painter->x1 = x1; + gdk_painter->y1 = y1; + gdk_painter->x2 = x2; +@@ -313,6 +310,8 @@ + gdk_painter->x2 = 0; + gdk_painter->y2 = 0; + } ++ ++ g_assert(gdk_drawable_get_colormap(gdk_painter->pixmap) != NULL); + } + + static void |