diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-10-12 12:27:06 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-10-12 12:27:06 -0400 |
| commit | 42fb020f3dab6910e2b29ebe7819aa8e62950ebd (patch) | |
| tree | d07bb29651614276dfc2629422b003dd847f8c96 | |
| parent | update tooltips patch some more (diff) | |
| download | gtk3-classic-build-gtk3-42fb020f3dab6910e2b29ebe7819aa8e62950ebd.tar.gz gtk3-classic-build-gtk3-42fb020f3dab6910e2b29ebe7819aa8e62950ebd.tar.bz2 gtk3-classic-build-gtk3-42fb020f3dab6910e2b29ebe7819aa8e62950ebd.zip | |
fix a tooltip crash
| -rw-r--r-- | 0001-New-tooltip-style.patch | 10 | ||||
| -rw-r--r-- | gtk3.spec | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/0001-New-tooltip-style.patch b/0001-New-tooltip-style.patch index 63723cf..0eee688 100644 --- a/0001-New-tooltip-style.patch +++ b/0001-New-tooltip-style.patch @@ -1,6 +1,6 @@ diff -up gtk+-2.91.0/gtk/gtktooltip.c.fresh-tooltips gtk+-2.91.0/gtk/gtktooltip.c --- gtk+-2.91.0/gtk/gtktooltip.c.fresh-tooltips 2010-09-27 20:40:00.000000000 -0400 -+++ gtk+-2.91.0/gtk/gtktooltip.c 2010-10-02 17:39:21.748134000 -0400 ++++ gtk+-2.91.0/gtk/gtktooltip.c 2010-10-12 12:24:35.351808000 -0400 @@ -35,6 +35,9 @@ #include "gtkalignment.h" #include "gtksizerequest.h" @@ -87,7 +87,7 @@ diff -up gtk+-2.91.0/gtk/gtktooltip.c.fresh-tooltips gtk+-2.91.0/gtk/gtktooltip. tooltip->custom_widget = NULL; } -@@ -517,19 +566,211 @@ gtk_tooltip_window_style_set (GtkTooltip +@@ -517,19 +566,209 @@ gtk_tooltip_window_style_set (GtkTooltip gtk_widget_queue_draw (tooltip->window); } @@ -283,14 +283,12 @@ diff -up gtk+-2.91.0/gtk/gtktooltip.c.fresh-tooltips gtk+-2.91.0/gtk/gtktooltip. + gtk_widget_get_allocated_width (tooltip->window), + gtk_widget_get_allocated_height (tooltip->window)); + cr = cairo_create (surface); -+ + fill_background (tooltip->window, cr); -+ + cairo_destroy (cr); ++ + cairo_set_source_surface (context, surface, 0, 0); + cairo_paint (context); + cairo_surface_destroy (surface); -+ cairo_destroy (context); + + update_shape (tooltip); + } @@ -311,7 +309,7 @@ diff -up gtk+-2.91.0/gtk/gtktooltip.c.fresh-tooltips gtk+-2.91.0/gtk/gtktooltip. } diff -up gtk+-2.91.0/gtk/gtkwidget.c.fresh-tooltips gtk+-2.91.0/gtk/gtkwidget.c --- gtk+-2.91.0/gtk/gtkwidget.c.fresh-tooltips 2010-09-30 21:30:41.000000000 -0400 -+++ gtk+-2.91.0/gtk/gtkwidget.c 2010-10-02 00:52:23.542456001 -0400 ++++ gtk+-2.91.0/gtk/gtkwidget.c 2010-10-12 12:07:04.421808000 -0400 @@ -2891,6 +2891,14 @@ gtk_widget_class_init (GtkWidgetClass *k 1, G_MAXINT, 16, GTK_PARAM_READABLE)); @@ -11,7 +11,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk3 Version: 2.91.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -261,6 +261,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache %doc tmpdocs/examples %changelog +* Tue Oct 12 2010 Matthias Clasen <mclasen@redhat.com> 2.91.0-2 +- Fix a crash in the tooltip code + * Sat Oct 2 2010 Matthias Clasen <mclasen@redhat.com> 2.91.0-1 - Update to 2.91.0 |