summaryrefslogtreecommitdiff
path: root/extra/gtk3
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-06-10 14:38:26 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-06-10 14:38:26 -0300
commitf5e137fdf748b757bacfc50577e5d48a693d31c4 (patch)
treec75bdfef17b69eff3b8bb20b285c880d7f9183c0 /extra/gtk3
parent300b3ee60aef9cfa0a32f5c69aa5e25ad637285f (diff)
parentdd5222c4ae447eb7a6bda08ec5a3c2339852dc16 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/chntpw/PKGBUILD community/hardinfo/PKGBUILD community/obconf/obconf.install community/xplc/PKGBUILD community/zziplib/PKGBUILD core/rp-pppoe/PKGBUILD extra/icedtea-web/PKGBUILD extra/icon-naming-utils/PKGBUILD extra/lxmenu-data/PKGBUILD extra/openbox/PKGBUILD extra/phonon-xine/PKGBUILD extra/qt/PKGBUILD extra/zope-interface/PKGBUILD libre/pacman/PKGBUILD libre/pacman/pacman.conf.mips64el libre/pacman/rePKGBUILD testing/coreutils/PKGBUILD testing/net-tools/PKGBUILD
Diffstat (limited to 'extra/gtk3')
-rw-r--r--extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch28
1 files changed, 0 insertions, 28 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
deleted file mode 100644
index a6514b550..000000000
--- a/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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