summaryrefslogtreecommitdiff
path: root/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-05-28 02:44:47 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-05-28 02:44:47 -0300
commitc3b94090a6330f678ade2f767e76ab7802d3463e (patch)
treee3d2321dce46bfdbc070fcee19e2852566510fe8 /extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch
parent652c41cc5fd8dc5f23ef6a6c93f488911e1054c7 (diff)
parent33feb015eb09eee76827f359e685fce981d88111 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/chmsee/PKGBUILD community/flumotion/PKGBUILD community/gnash/PKGBUILD community/kadu/PKGBUILD community/mythplugins/PKGBUILD community/performous/PKGBUILD community/sleuthkit/PKGBUILD community/virtualbox/PKGBUILD community/wbar/PKGBUILD core/attr/PKGBUILD core/binutils/PKGBUILD core/heimdal/PKGBUILD core/sqlite3/PKGBUILD extra/acpid/PKGBUILD extra/apache-ant/PKGBUILD extra/aria2/PKGBUILD extra/boost/PKGBUILD extra/bs/PKGBUILD extra/bzr/PKGBUILD extra/cvsps/PKGBUILD extra/dosbox/PKGBUILD extra/ettercap-gtk/PKGBUILD extra/fetchmail/PKGBUILD extra/gnome-desktop-sharp/PKGBUILD extra/gnome-panel/PKGBUILD extra/gptfdisk/PKGBUILD extra/gqmpeg/PKGBUILD extra/gstreamer0.10-base/PKGBUILD extra/gstreamer0.10-ugly/PKGBUILD extra/gtk-theme-switch2/PKGBUILD extra/icecast/PKGBUILD extra/kdeedu/PKGBUILD extra/kmldonkey/PKGBUILD extra/kmplayer/PKGBUILD extra/libbtctl/PKGBUILD extra/libftdi/PKGBUILD extra/liborigin2/PKGBUILD extra/libpst/PKGBUILD extra/libx86/PKGBUILD extra/lsdvd/PKGBUILD extra/mc/PKGBUILD extra/monotone/PKGBUILD extra/multitail/PKGBUILD extra/nbsmtp/PKGBUILD extra/nickle/PKGBUILD extra/nppangband/PKGBUILD extra/numlockx/PKGBUILD extra/pidgin/PKGBUILD extra/poppler/PKGBUILD extra/python-gtkglext/PKGBUILD extra/scim/PKGBUILD extra/socat/PKGBUILD extra/speedcrunch/PKGBUILD extra/transmission/PKGBUILD extra/vbetool/PKGBUILD extra/vlc/PKGBUILD extra/xchat-gnome/xchat-gnome.install libre/kernel26-libre/PKGBUILD libre/pacman/PKGBUILD libre/xchat-gnome-libre/PKGBUILD libre/xchat-gnome-libre/gtk2-2.20.patch libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch libre/xchat-gnome-libre/xchat-gnome.install multilib/nspluginwrapper/PKGBUILD testing/libgweather/libgweather.install testing/mesa/PKGBUILD
Diffstat (limited to 'extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch')
-rw-r--r--extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch b/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch
new file mode 100644
index 000000000..a6514b550
--- /dev/null
+++ b/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch
@@ -0,0 +1,28 @@
+From 847df205ede7f624c2bc4c4498495352cc865423 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte@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