diff options
| author | Joel Bosveld <Joel.Bosveld@gmail.com> | 2009-08-14 05:08:24 +0800 |
|---|---|---|
| committer | Joel Bosveld <Joel.Bosveld@gmail.com> | 2009-08-14 05:08:24 +0800 |
| commit | 6c2d66015840a61f4eef68b26661888b6258f8e4 (patch) | |
| tree | be61cdf919f5e1380967dc141186512fa09ec26e | |
| parent | 5e255319837b9ea051e54f0a84d69d1984f8a971 (diff) | |
patches: fix leak in patch for qt
| -rw-r--r-- | patches/qt.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/patches/qt.patch b/patches/qt.patch index fbdba4b..66ecb80 100644 --- a/patches/qt.patch +++ b/patches/qt.patch @@ -1,4 +1,4 @@ -From 58629708054c40931b2a63d4f50a5249f2d6001d Mon Sep 17 00:00:00 2001 +From b2ff5bf8c40a4f48c8f7b19bdd96126ffbde5971 Mon Sep 17 00:00:00 2001 From: Joel Bosveld <Joel.Bosveld@gmail.com> Date: Fri, 7 Aug 2009 10:41:37 +0800 Subject: [PATCH] Add support for redirected windows @@ -6,10 +6,10 @@ Subject: [PATCH] Add support for redirected windows --- configure | 2 +- src/gui/kernel/qapplication_x11.cpp | 26 +++++++++++++ - src/gui/kernel/qdnd_x11.cpp | 69 +++++++++++++++++++++++++++++++++++ + src/gui/kernel/qdnd_x11.cpp | 70 +++++++++++++++++++++++++++++++++++ src/gui/kernel/qt_x11_p.h | 18 +++++++++ src/gui/kernel/qwidget_x11.cpp | 1 + - 5 files changed, 115 insertions(+), 1 deletions(-) + 5 files changed, 116 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 31eade9..6e8d8da 100755 @@ -69,10 +69,10 @@ index 33aec9e..b400c1f 100644 int mitshm_minor; int mitshm_major; diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp -index 8611307..7d73ca0 100644 +index 8611307..9d9b5f0 100644 --- a/src/gui/kernel/qdnd_x11.cpp +++ b/src/gui/kernel/qdnd_x11.cpp -@@ -1409,6 +1409,70 @@ void QDragManager::cancel(bool deleteSource) +@@ -1409,6 +1409,71 @@ void QDragManager::cancel(bool deleteSource) } static @@ -112,6 +112,7 @@ index 8611307..7d73ca0 100644 + break; + } + } ++ if (c) XFree (c); + } + } + else if (t) @@ -143,7 +144,7 @@ index 8611307..7d73ca0 100644 Window findRealWindow(const QPoint & pos, Window w, int md) { if (xdnd_data.deco && w == xdnd_data.deco->effectiveWinId()) -@@ -1499,6 +1563,11 @@ void QDragManager::move(const QPoint & globalPos) +@@ -1499,6 +1564,11 @@ void QDragManager::move(const QPoint & globalPos) if (target == rootwin) { // Ok. |