summaryrefslogtreecommitdiff
path: root/libre/kdelibs-libre/fix-xfreepixmap-call.patch
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-01-28 03:27:16 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-01-28 03:27:16 +0000
commit462391357aa5e749dc9908c15f3baa0b4416f3d8 (patch)
tree11d4d3f054aae9ffd869adc634054f64a16d83b8 /libre/kdelibs-libre/fix-xfreepixmap-call.patch
parent748e32a3a886569b58a27003e85b76be5746153d (diff)
Tue Jan 28 03:22:21 UTC 2014
Diffstat (limited to 'libre/kdelibs-libre/fix-xfreepixmap-call.patch')
-rw-r--r--libre/kdelibs-libre/fix-xfreepixmap-call.patch24
1 files changed, 0 insertions, 24 deletions
diff --git a/libre/kdelibs-libre/fix-xfreepixmap-call.patch b/libre/kdelibs-libre/fix-xfreepixmap-call.patch
deleted file mode 100644
index 5f5354633..000000000
--- a/libre/kdelibs-libre/fix-xfreepixmap-call.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 9323adac35d40da69e3cb18504340e984c4afd05
-Author: Anne-Marie Mahfouf <annma@kde.org>
-Date: Fri May 10 17:12:33 2013 +0200
-
- Fix crash when quitting apps
-
- Backport to 4.10 branch
-
- CCBUG: 319137
-
-diff --git a/plasma/private/dialogshadows.cpp b/plasma/private/dialogshadows.cpp
-index b54fb1a..1925670 100644
---- a/plasma/private/dialogshadows.cpp
-+++ b/plasma/private/dialogshadows.cpp
-@@ -336,6 +336,9 @@ void DialogShadows::Private::freeX11Pixmaps()
- {
- #ifdef Q_WS_X11
- foreach (const QPixmap &pixmap, m_shadowPixmaps) {
-+ if (!QX11Info::display()) {
-+ return;
-+ }
- if (!pixmap.isNull()) {
- XFreePixmap(QX11Info::display(), pixmap.handle());
- }