Date: Thursday, May 26, 2011 @ 08:54:23 Author: ibiru Revision: 125375
silence warning Added: gtk3/trunk/only_draw_resize_grip_if_its_window_exists.patch Modified: gtk3/trunk/PKGBUILD --------------------------------------------------+ PKGBUILD | 9 ++++-- only_draw_resize_grip_if_its_window_exists.patch | 28 +++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-05-26 12:53:42 UTC (rev 125374) +++ PKGBUILD 2011-05-26 12:54:23 UTC (rev 125375) @@ -3,7 +3,7 @@ pkgname=gtk3 pkgver=3.0.10 -pkgrel=1 +pkgrel=2 pkgdesc="The GTK+ Toolkit (v3)" arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -14,12 +14,15 @@ backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.0/gtk+-${pkgver}.tar.bz2 - settings.ini) + settings.ini + only_draw_resize_grip_if_its_window_exists.patch) sha256sums=('a217ed31aed9843810eabb241239e0f2c5ca0e14bd91687cf4180b3e346abc30' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' + 'fa2bd8085cae6cdb4f3b8baae11d3c0b38afec2eb4503f5bacabf87aee15313a') build() { cd "${srcdir}/gtk+-${pkgver}" + patch -Np1 -i "${srcdir}/only_draw_resize_grip_if_its_window_exists.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ Added: only_draw_resize_grip_if_its_window_exists.patch =================================================================== --- only_draw_resize_grip_if_its_window_exists.patch (rev 0) +++ only_draw_resize_grip_if_its_window_exists.patch 2011-05-26 12:54:23 UTC (rev 125375) @@ -0,0 +1,28 @@ +From 847df205ede7f624c2bc4c4498495352cc865423 Mon Sep 17 00:00:00 2001 +From: Benjamin Otte <o...@redhat.com> +Date: Mon, 23 May 2011 13:46:59 +0000 +Subject: window: Only draw resize grip if its window exists + +Don't rely on priv->resize_grip_visible as the code comment in the +variable declaration indicates. +This fixes warnings with GtkPlug, which can cause resize_grip_visible to +be TRUE but grid_window to be NULL - running tests/teststatusicon +reproduces this. + +This broke with 0cf31b35eb10cb5bc08048ecdc141c949efec4cc +--- +diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c +index b97418a..b1caa9b 100644 +--- a/gtk/gtkwindow.c ++++ b/gtk/gtkwindow.c +@@ -7304,7 +7304,7 @@ gtk_window_draw (GtkWidget *widget, + if (GTK_WIDGET_CLASS (gtk_window_parent_class)->draw) + ret = GTK_WIDGET_CLASS (gtk_window_parent_class)->draw (widget, cr); + +- if (priv->resize_grip_visible && ++ if (priv->grip_window && + gtk_cairo_should_draw_window (cr, priv->grip_window)) + { + GdkRectangle rect; +-- +cgit v0.9